diff options
author | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2016-03-21 13:02:53 +0100 |
commit | 3b0c7ac1f9d64afc933ce0354037c709366b7dff (patch) | |
tree | 39cefed54f79f93f82e9c33a4e094270103bf137 /mysql-test/r/mysqldump.result | |
parent | e7cf898d6dc3dcac41f58db4761df3a6d1dffc03 (diff) | |
parent | 22ebf3cb456e0d8db295e7cc93f08e3d3ecfea47 (diff) | |
download | mariadb-git-3b0c7ac1f9d64afc933ce0354037c709366b7dff.tar.gz |
Merge branch '10.0' into 10.1
Diffstat (limited to 'mysql-test/r/mysqldump.result')
-rw-r--r-- | mysql-test/r/mysqldump.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 6652701090c..559f8885b0d 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -1821,7 +1821,7 @@ a b Osnabrück Köln drop table t1; # -# Bug#15328 Segmentation fault occured if my.cnf is invalid for escape sequence +# Bug#15328 Segmentation fault occurred if my.cnf is invalid for escape sequence # --fields-optionally-enclosed-by=" # |