bk commit into 5.0 tree (stewart:1.2473) BUG#26793

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart. When stewart does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-14 15:07:17+10:00, stewart@willster.(none) +2 -0
   Backport Magnus' fix from 5.1
  
  ChangeSet@stripped, 2007-08-07 19:16:06+02:00, msvensson@pilot.(none) +2 -0
    Bug#26793 mysqld crashes when doing specific query on information_schema
     - Drop the newly created user user1@localhost
     - Cleanup testcase

  mysql-test/r/ndb_bug26793.result@stripped, 2007-08-14 15:07:15+10:00, stewart@willster.(none) +1 -6
      mysql-test/r/ndb_bug26793.result@stripped, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none)
    +1 -6
        Update test result

  mysql-test/t/ndb_bug26793.test@stripped, 2007-08-14 15:07:15+10:00, stewart@willster.(none) +8 -11
      mysql-test/t/ndb_bug26793.test@stripped, 2007-08-07 19:16:04+02:00, msvensson@pilot.(none) +8
    -11
        - Remove the drop/restore of anonymous users - there are no such users
        by default anymore(if there were, they would probably be in mysql.user)
        - Switch back to default connection before cleanup 
        - Drop user1@localhost as part of cleanup

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/ndb

--- 1.2/mysql-test/r/ndb_bug26793.result	2007-07-27 17:12:50 +10:00
+++ 1.3/mysql-test/r/ndb_bug26793.result	2007-08-14 15:07:15 +10:00
@@ -3,11 +3,6 @@
 `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
 `t` VARCHAR( 10 ) NOT NULL
 ) ENGINE = ndbcluster;
-create table test.db_temp as select * from mysql.db where user='';
-delete from mysql.db where user='';
-flush privileges;
 GRANT USAGE ON *.* TO user1@localhost IDENTIFIED BY 'pass';
 DROP TABLE `test`.`test`;
-insert into mysql.db select * from test.db_temp;
-drop table db_temp;
-flush privileges;
+drop user user1@localhost;

--- 1.2/mysql-test/t/ndb_bug26793.test	2007-07-27 17:12:50 +10:00
+++ 1.3/mysql-test/t/ndb_bug26793.test	2007-08-14 15:07:15 +10:00
@@ -9,15 +9,12 @@
 `t` VARCHAR( 10 ) NOT NULL
 ) ENGINE = ndbcluster;
 
-create table test.db_temp as select * from mysql.db where user='';
-delete from mysql.db where user='';
-
-flush privileges;
-
+# Add user1@localhost with a specific password
+# and connect as that user
 GRANT USAGE ON *.* TO user1@localhost IDENTIFIED BY 'pass';
-
 connect (user1,localhost,user1,pass,*NO-ONE*);
 
+# Run the query 100 times
 disable_query_log;
 disable_result_log;
 let $i= 100;
@@ -29,10 +26,10 @@
 enable_query_log;
 enable_result_log;
 
-connect (root,localhost,root,,test);
-connection root;
+disconnect user1;
+
+# Switch back to the default connection and cleanup
+connection default;
 DROP TABLE `test`.`test`;
-insert into mysql.db select * from test.db_temp;
-drop table db_temp;
-flush privileges;
+drop user user1@localhost;