summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--defaults-file.result
diff options
context:
space:
mode:
authorMats Kindahl <mats.kindahl@oracle.com>2011-02-08 11:21:14 +0100
committerMats Kindahl <mats.kindahl@oracle.com>2011-02-08 11:21:14 +0100
commit3bea4a20a4d9ddce774512bbe53ea47a44754c49 (patch)
tree4f761a6febac5039918f44935125c7e869c35fae /mysql-test/r/mysqld--defaults-file.result
parent37adcd8c400c03d0bbb36c8a7505b1c747d2763d (diff)
downloadmariadb-git-3bea4a20a4d9ddce774512bbe53ea47a44754c49.tar.gz
Bug #58455
Starting mysqld with defaults file without extension cause segmentation fault Bug occurs because fn_expand calls fn_format with NULL as ext. This is a backport of the patch from 5.6. Patch solve this problem by using an empty string as extension, and adding assertions to fn_format that correct arguments are passed. It also add a test tests several variations of using non-existing defaults files.
Diffstat (limited to 'mysql-test/r/mysqld--defaults-file.result')
-rw-r--r--mysql-test/r/mysqld--defaults-file.result12
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--defaults-file.result b/mysql-test/r/mysqld--defaults-file.result
new file mode 100644
index 00000000000..5fd5ca8d95a
--- /dev/null
+++ b/mysql-test/r/mysqld--defaults-file.result
@@ -0,0 +1,12 @@
+Could not open required defaults file: /path/with/no/extension
+Fatal error in defaults handling. Program aborted
+Could not open required defaults file: /path/with.ext
+Fatal error in defaults handling. Program aborted
+Could not open required defaults file: MYSQL_TEST_DIR/relative/path/with.ext
+Fatal error in defaults handling. Program aborted
+Could not open required defaults file: MYSQL_TEST_DIR/relative/path/without/extension
+Fatal error in defaults handling. Program aborted
+Could not open required defaults file: MYSQL_TEST_DIR/with.ext
+Fatal error in defaults handling. Program aborted
+Could not open required defaults file: MYSQL_TEST_DIR/no_extension
+Fatal error in defaults handling. Program aborted