bk commit into 5.0 tree (jimw:1.1891)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw 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
  1.1891 05/07/05 15:23:13 jimw@stripped +5 -0
  Merge mysql.com:/home/jimw/my/mysql-4.1-clean
  into  mysql.com:/home/jimw/my/mysql-5.0-clean

  mysql-test/t/grant.test
    1.31 05/07/05 15:23:10 jimw@stripped +0 -0
    Merge

  mysql-test/r/grant.result
    1.41 05/07/05 15:23:10 jimw@stripped +5 -5
    Merge

  sql/sql_table.cc
    1.259 05/07/05 15:22:06 jimw@stripped +0 -0
    Auto merged

  sql/sql_acl.cc
    1.162 05/07/05 15:22:06 jimw@stripped +0 -0
    Auto merged

  mysql-test/r/query_cache.result
    1.57 05/07/05 15:22:05 jimw@stripped +0 -0
    Auto merged

# 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:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-5.0-clean/RESYNC

--- 1.161/sql/sql_acl.cc	2005-06-22 02:08:21 -07:00
+++ 1.162/sql/sql_acl.cc	2005-07-05 15:22:06 -07:00
@@ -2035,7 +2035,8 @@
   {
     uint key_prefix_len;
     KEY_PART_INFO *key_part= col_privs->key_info->key_part;
-    col_privs->field[0]->store(host.hostname,(uint) strlen(host.hostname),
+    col_privs->field[0]->store(host.hostname,
+                               host.hostname ? (uint) strlen(host.hostname) : 0,
                                system_charset_info);
     col_privs->field[1]->store(db,(uint) strlen(db), system_charset_info);
     col_privs->field[2]->store(user,(uint) strlen(user), system_charset_info);

--- 1.258/sql/sql_table.cc	2005-07-05 03:40:55 -07:00
+++ 1.259/sql/sql_table.cc	2005-07-05 15:22:06 -07:00
@@ -1550,14 +1550,12 @@
       /* Check if table exists */
   if (create_info->options & HA_LEX_CREATE_TMP_TABLE)
   {
-    char tmp_table_name[tmp_file_prefix_length+22+22+22+3];
-    my_snprintf(tmp_table_name, sizeof(tmp_table_name), "%s%lx_%lx_%x",
-		tmp_file_prefix, current_pid, thd->thread_id,
-		thd->tmp_table++);
+    my_snprintf(path, sizeof(path), "%s%s%lx_%lx_%x%s",
+		mysql_tmpdir, tmp_file_prefix, current_pid, thd->thread_id,
+		thd->tmp_table++, reg_ext);
     if (lower_case_table_names)
-      my_casedn_str(files_charset_info, tmp_table_name);
+      my_casedn_str(files_charset_info, path);
     create_info->table_options|=HA_CREATE_DELAY_KEY_WRITE;
-    build_table_path(path, sizeof(path), db, tmp_table_name, reg_ext);
   }
   else
     build_table_path(path, sizeof(path), db, alias, reg_ext);

--- 1.40/mysql-test/r/grant.result	2005-07-05 03:36:29 -07:00
+++ 1.41/mysql-test/r/grant.result	2005-07-05 15:23:10 -07:00
@@ -586,3 +586,8 @@
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM dummy@localhost;
 DROP USER dummy@localhost;
 DROP DATABASE mysqltest;
+use mysql;
+insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_grantor',CURRENT_TIMESTAMP,'Select','Select');
+flush privileges;
+delete from tables_priv where host = '' and user = 'mysqltest_1';
+flush privileges;

--- 1.30/mysql-test/t/grant.test	2005-07-05 03:36:31 -07:00
+++ 1.31/mysql-test/t/grant.test	2005-07-05 15:23:10 -07:00
@@ -470,3 +470,12 @@
 REVOKE ALL PRIVILEGES, GRANT OPTION FROM dummy@localhost;
 DROP USER dummy@localhost;
 DROP DATABASE mysqltest;
+#
+# Bug #11330: Entry in tables_priv with host = '' causes crash
+#
+connection default;
+use mysql;
+insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_grantor',CURRENT_TIMESTAMP,'Select','Select');
+flush privileges;
+delete from tables_priv where host = '' and user = 'mysqltest_1';
+flush privileges;