bk commit into 5.0 tree (gluh:1.2104) BUG#18177

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh 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.2104 06/05/04 14:46:16 gluh@stripped +3 -0
  Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
   replaced get_field(MEM_ROOT *mem, Field *field) with 
   get_field(MEM_ROOT *mem, Field *field, String *res).
   It allows to avoid strlen().

  sql/sql_show.cc
    1.314 06/05/04 14:46:10 gluh@stripped +12 -11
    Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
     replaced get_field(MEM_ROOT *mem, Field *field) with 
     get_field(MEM_ROOT *mem, Field *field, String *res).
     It allows to avoid strlen().

  mysql-test/t/information_schema.test
    1.76 06/05/04 14:46:10 gluh@stripped +11 -0
    Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
     test case

  mysql-test/r/information_schema.result
    1.102 06/05/04 14:46:09 gluh@stripped +9 -0
    Fix for bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
     test case

# 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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/5.0

--- 1.313/sql/sql_show.cc	Mon Mar 20 14:17:41 2006
+++ 1.314/sql/sql_show.cc	Thu May  4 14:46:10 2006
@@ -2836,17 +2836,18 @@ bool store_schema_proc(THD *thd, TABLE *
                        const char *wild, bool full_access, const char *sp_user)
 {
   String tmp_string;
+  String sp_db, sp_name, definer;
   TIME time;
   LEX *lex= thd->lex;
   CHARSET_INFO *cs= system_charset_info;
-  const char *sp_db, *sp_name, *definer;
-  sp_db= get_field(thd->mem_root, proc_table->field[0]);
-  sp_name= get_field(thd->mem_root, proc_table->field[1]);
-  definer= get_field(thd->mem_root, proc_table->field[11]);
+  get_field(thd->mem_root, proc_table->field[0], &sp_db);
+  get_field(thd->mem_root, proc_table->field[1], &sp_name);
+  get_field(thd->mem_root, proc_table->field[11], &definer);
   if (!full_access)
-    full_access= !strcmp(sp_user, definer);
-  if (!full_access && check_some_routine_access(thd, sp_db, sp_name,
-			proc_table->field[2]->val_int() == TYPE_ENUM_PROCEDURE))
+    full_access= !strcmp(sp_user, definer.ptr());
+  if (!full_access && check_some_routine_access(thd, sp_db.ptr(), sp_name.ptr(),
+                                                proc_table->field[2]->val_int() ==
+                                                TYPE_ENUM_PROCEDURE))
     return 0;
 
   if (lex->orig_sql_command == SQLCOM_SHOW_STATUS_PROC &&
@@ -2856,13 +2857,13 @@ bool store_schema_proc(THD *thd, TABLE *
       lex->orig_sql_command == SQLCOM_END)
   {
     restore_record(table, s->default_values);
-    if (!wild || !wild[0] || !wild_compare(sp_name, wild, 0))
+    if (!wild || !wild[0] || !wild_compare(sp_name.ptr(), wild, 0))
     {
       int enum_idx= proc_table->field[5]->val_int();
-      table->field[3]->store(sp_name, strlen(sp_name), cs);
+      table->field[3]->store(sp_name.ptr(), sp_name.length(), cs);
       get_field(thd->mem_root, proc_table->field[3], &tmp_string);
       table->field[0]->store(tmp_string.ptr(), tmp_string.length(), cs);
-      table->field[2]->store(sp_db, strlen(sp_db), cs);
+      table->field[2]->store(sp_db.ptr(), sp_db.length(), cs);
       get_field(thd->mem_root, proc_table->field[2], &tmp_string);
       table->field[4]->store(tmp_string.ptr(), tmp_string.length(), cs);
       if (proc_table->field[2]->val_int() == TYPE_ENUM_FUNCTION)
@@ -2894,7 +2895,7 @@ bool store_schema_proc(THD *thd, TABLE *
       table->field[17]->store(tmp_string.ptr(), tmp_string.length(), cs);
       get_field(thd->mem_root, proc_table->field[15], &tmp_string);
       table->field[18]->store(tmp_string.ptr(), tmp_string.length(), cs);
-      table->field[19]->store(definer, strlen(definer), cs);
+      table->field[19]->store(definer.ptr(), definer.length(), cs);
       return schema_table_store_record(thd, table);
     }
   }

--- 1.101/mysql-test/r/information_schema.result	Fri Apr  7 12:32:18 2006
+++ 1.102/mysql-test/r/information_schema.result	Thu May  4 14:46:09 2006
@@ -1096,3 +1096,12 @@ group by column_type order by num;
 column_type	group_concat(table_schema, '.', table_name)	num
 varchar(20)	information_schema.COLUMNS	1
 varchar(7)	information_schema.ROUTINES,information_schema.VIEWS	2
+use mysql;
+INSERT INTO `proc` VALUES ('test','','PROCEDURE','','SQL','CONTAINS_SQL',
+'NO','DEFINER','','','BEGIN\r\n  \r\nEND','root@%','2006-03-02 18:40:03',
+'2006-03-02 18:40:03','','');
+select routine_name from information_schema.routines;
+routine_name
+
+delete from proc where name='';
+use test;

--- 1.75/mysql-test/t/information_schema.test	Tue Apr 25 00:42:40 2006
+++ 1.76/mysql-test/t/information_schema.test	Thu May  4 14:46:10 2006
@@ -811,3 +811,14 @@ from information_schema.columns where
 table_schema='information_schema' and
 (column_type = 'varchar(7)' or column_type = 'varchar(20)')
 group by column_type order by num;
+
+#
+# Bug#18177 any access to INFORMATION_SCHEMA.ROUTINES crashes
+#
+use mysql;
+INSERT INTO `proc` VALUES ('test','','PROCEDURE','','SQL','CONTAINS_SQL',
+'NO','DEFINER','','','BEGIN\r\n  \r\nEND','root@%','2006-03-02 18:40:03',
+'2006-03-02 18:40:03','','');
+select routine_name from information_schema.routines;
+delete from proc where name='';
+use test;