diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-05-29 09:06:06 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-05-29 09:06:06 +0200 |
| commit | acf5b9490f9964abf95af4b94a8b3ba3fbd9a638 (patch) | |
| tree | f6ecc9b81bf485b6ce79abbead78cd46a8204802 /mysql-test | |
| parent | e9ad2183c306fe29432b68aac04132ebb16482cc (diff) | |
| parent | 81dd2cd096c08bd039738c594c2b06dd199de43f (diff) | |
| download | mariadb-git-acf5b9490f9964abf95af4b94a8b3ba3fbd9a638.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
mysys/default.c:
Auto merged
mysql-test/mysql-test-run.pl:
Merge backport
mysql-test/mysql-test-run.sh:
Merge backport
mysql-test/r/mysqldump.result:
Manual merge
mysql-test/t/mysqldump.test:
Manual merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/mysqldump.result | 1 | ||||
| -rw-r--r-- | mysql-test/std_data/bug15328.cnf | 2 | ||||
| -rw-r--r-- | mysql-test/t/mysqldump.test | 7 |
3 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 923c5084d47..c9042600864 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -655,6 +655,7 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; +--fields-optionally-enclosed-by=" /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/mysql-test/std_data/bug15328.cnf b/mysql-test/std_data/bug15328.cnf new file mode 100644 index 00000000000..e23d33bfa54 --- /dev/null +++ b/mysql-test/std_data/bug15328.cnf @@ -0,0 +1,2 @@ +[mysqldump] +fields-optionally-enclosed-by=" diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 74610fec0f4..d53022665a0 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -607,6 +607,13 @@ drop table t1, t2; drop database db1; # +# BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence +# + +--exec $MYSQL_MY_PRINT_DEFAULTS --defaults-extra-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump + + +# # Bug #9558 mysqldump --no-data db t1 t2 format still dumps data # |