bzr commit into mysql-5.1-bugteam branch (gshchepa:2904) Bug#42778

[Gleb Shchepa]

#At file:///home/uchum/work/bzr/mysql-5.1-bugteam/ based on revid:gshchepa@stripped

 2904 Gleb Shchepa	2009-05-22
      Bug #42778: delete order by null global variable causes 
                  assertion .\filesort.cc, line 797
      
      Minor fix to test case (embedded server failure).

    modified:
      mysql-test/r/variables.result
      mysql-test/t/variables.test
=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result	2009-05-21 20:22:46 +0000
+++ b/mysql-test/r/variables.result	2009-05-22 06:44:11 +0000
@@ -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;

=== modified file 'mysql-test/t/variables.test'
--- a/mysql-test/t/variables.test	2009-05-21 20:22:46 +0000
+++ b/mysql-test/t/variables.test	2009-05-22 06:44:11 +0000
@@ -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 ();


Attachment: [text/bzr-bundle] bzr/[e-mail]