diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-10-19 11:00:44 +0500 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-10-19 11:00:44 +0500 |
| commit | 9c8436505ddacb7df84962f2c80ce116cae5125c (patch) | |
| tree | 671262bd6d96c155fa54e4aeb31b54325e87b70d | |
| parent | 1412365a3f277d562d016e353ad0240eba4697e5 (diff) | |
| download | mariadb-git-9c8436505ddacb7df84962f2c80ce116cae5125c.tar.gz | |
A fix (bug #6101: mysqldump writes invalid SQL).
client/mysqldump.c:
A fix (bug #6101: mysqldump writes invalid SQL).
Syntax corrected.
| -rw-r--r-- | client/mysqldump.c | 2 | ||||
| -rw-r--r-- | mysql-test/r/mysqldump.result | 20 | ||||
| -rw-r--r-- | mysql-test/t/mysqldump.test | 6 |
3 files changed, 27 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 56505afd235..e2101bd6c23 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1797,7 +1797,7 @@ static int init_dumping(char *database) MYSQL_ROW row; MYSQL_RES *dbinfo; - sprintf(qbuf,"SHOW CREATE DATABASE WITH IF NOT EXISTS %s", + sprintf(qbuf,"SHOW CREATE DATABASE IF NOT EXISTS %s", qdatabase); if (mysql_query(sock, qbuf) || !(dbinfo = mysql_store_result(sock))) diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 7e69620394b..5d6fbd713e8 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -332,3 +332,23 @@ CREATE TABLE `t1` ( 2 3 drop table t1; + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!40101 SET NAMES utf8 */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE="NO_AUTO_VALUE_ON_ZERO" */; + +CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */; + +USE `test`; + +/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; +/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; +/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; +/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; +/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; + diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 89b3739f955..3d8f417bad0 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -127,3 +127,9 @@ insert into t1 values (1),(2),(3); --exec rm $MYSQL_TEST_DIR/var/tmp/t1.sql --exec rm $MYSQL_TEST_DIR/var/tmp/t1.txt drop table t1; + +# +# Bug #6101: create database problem +# + +--exec $MYSQL_DUMP --skip-comments --databases test |