diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2009-05-22 11:44:11 +0500 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2009-05-22 11:44:11 +0500 |
| commit | 8354ce0771672b264ad3aac9e056381060edf1e2 (patch) | |
| tree | 0c21f881a7343da1daba3d2d88e99fea4da221f0 /mysql-test | |
| parent | 06142cd5452efc4ea0ac48d9340dd28f4a9e520b (diff) | |
| download | mariadb-git-8354ce0771672b264ad3aac9e056381060edf1e2.tar.gz | |
Bug #42778: delete order by null global variable causes
assertion .\filesort.cc, line 797
Minor fix to test case (embedded server failure).
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/variables.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/variables.test | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index 244a40a0f30..3f79d81dd71 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -1470,15 +1470,6 @@ SET GLOBAL server_id = @old_server_id; SELECT @@GLOBAL.INIT_FILE, @@GLOBAL.INIT_FILE IS NULL; @@GLOBAL.INIT_FILE @@GLOBAL.INIT_FILE IS NULL NULL 1 -SELECT @@GLOBAL.REPORT_HOST, @@GLOBAL.REPORT_HOST IS NULL; -@@GLOBAL.REPORT_HOST @@GLOBAL.REPORT_HOST IS NULL -NULL 1 -SELECT @@GLOBAL.REPORT_PASSWORD, @@GLOBAL.REPORT_PASSWORD IS NULL; -@@GLOBAL.REPORT_PASSWORD @@GLOBAL.REPORT_PASSWORD IS NULL -NULL 1 -SELECT @@GLOBAL.REPORT_USER, @@GLOBAL.REPORT_USER IS NULL; -@@GLOBAL.REPORT_USER @@GLOBAL.REPORT_USER IS NULL -NULL 1 CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (); SET @bug42778= @@sql_safe_updates; diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test index b404b5b07fb..c568b79185d 100644 --- a/mysql-test/t/variables.test +++ b/mysql-test/t/variables.test @@ -1207,9 +1207,6 @@ SET GLOBAL server_id = @old_server_id; # SELECT @@GLOBAL.INIT_FILE, @@GLOBAL.INIT_FILE IS NULL; -SELECT @@GLOBAL.REPORT_HOST, @@GLOBAL.REPORT_HOST IS NULL; -SELECT @@GLOBAL.REPORT_PASSWORD, @@GLOBAL.REPORT_PASSWORD IS NULL; -SELECT @@GLOBAL.REPORT_USER, @@GLOBAL.REPORT_USER IS NULL; CREATE TABLE t1 (a INT); INSERT INTO t1 VALUES (); |