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/std_data | |
| 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/std_data')
| -rw-r--r-- | mysql-test/std_data/bug15328.cnf | 2 |
1 files changed, 2 insertions, 0 deletions
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=" |