From f5c93081840f54261bcef0fb4b1223abf30c4ff9 Mon Sep 17 00:00:00 2001 From: Gleb Shchepa Date: Fri, 22 May 2009 11:44:11 +0500 Subject: [PATCH] Bug #42778: delete order by null global variable causes assertion .\filesort.cc, line 797 Minor fix to test case (embedded server failure). --- mysql-test/r/variables.result | 9 --------- mysql-test/t/variables.test | 3 --- 2 files changed, 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 ();