bk commit into 5.0 tree (gluh:1.1946) BUG#11055

[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.1946 05/06/16 12:12:47 gluh@stripped +5 -0
  Fix for bug#11055: information_schema: routines.sql_data_access has wrong value

  sql/structs.h
    1.48 05/06/16 12:11:48 gluh@stripped +2 -0
    Fix for bug#11055: information_schema: routines.sql_data_access has wrong value

  sql/sql_show.cc
    1.251 05/06/16 12:11:48 gluh@stripped +3 -4
    Fix for bug#11055: information_schema: routines.sql_data_access has wrong value

  sql/sql_lex.h
    1.184 05/06/16 12:11:48 gluh@stripped +8 -0
    Fix for bug#11055: information_schema: routines.sql_data_access has wrong value

  mysql-test/t/information_schema.test
    1.39 05/06/16 12:11:48 gluh@stripped +10 -0
    Fix for bug#11055: information_schema: routines.sql_data_access has wrong value

  mysql-test/r/information_schema.result
    1.56 05/06/16 12:11:47 gluh@stripped +9 -0
    Fix for bug#11055: information_schema: routines.sql_data_access has wrong value

# 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.183/sql/sql_lex.h	Thu Jun  9 02:11:22 2005
+++ 1.184/sql/sql_lex.h	Thu Jun 16 12:11:48 2005
@@ -114,6 +114,14 @@
   SP_MODIFIES_SQL_DATA
 };
 
+const LEX_STRING sp_data_access_name[]=
+{
+  { (char*) STRING_WITH_LEN("") },
+  { (char*) STRING_WITH_LEN("CONTAINS SQL") },
+  { (char*) STRING_WITH_LEN("NO SQL") },
+  { (char*) STRING_WITH_LEN("READS SQL DATA") },
+  { (char*) STRING_WITH_LEN("MODIFIES SQL DATA") }
+};
 
 #define DERIVED_SUBQUERY	1
 #define DERIVED_VIEW		2

--- 1.250/sql/sql_show.cc	Fri Jun 10 17:34:41 2005
+++ 1.251/sql/sql_show.cc	Thu Jun 16 12:11:48 2005
@@ -2645,6 +2645,7 @@
     restore_record(table, s->default_values);
     if (!wild || !wild[0] || !wild_compare(sp_name, wild, 0))
     {
+      int enum_idx= proc_table->field[5]->val_int();
       table->field[3]->store(sp_name, strlen(sp_name), cs);
       get_field(thd->mem_root, proc_table->field[3], &tmp_string);
       table->field[0]->store(tmp_string.ptr(), tmp_string.length(), cs);
@@ -2666,10 +2667,8 @@
       table->field[10]->store("SQL", 3, cs);
       get_field(thd->mem_root, proc_table->field[6], &tmp_string);
       table->field[11]->store(tmp_string.ptr(), tmp_string.length(), cs);
-      if (proc_table->field[5]->val_int() == SP_CONTAINS_SQL)
-      {
-        table->field[12]->store("CONTAINS SQL", 12 , cs);
-      }
+      table->field[12]->store(sp_data_access_name[enum_idx].str, 
+                              sp_data_access_name[enum_idx].length , cs);
       get_field(thd->mem_root, proc_table->field[7], &tmp_string);
       table->field[14]->store(tmp_string.ptr(), tmp_string.length(), cs);
       bzero((char *)&time, sizeof(time));

--- 1.47/sql/structs.h	Fri May 27 00:01:48 2005
+++ 1.48/sql/structs.h	Thu Jun 16 12:11:48 2005
@@ -20,6 +20,8 @@
 struct st_table;
 class Field;
 
+#define STRING_WITH_LEN(X)  X, (sizeof(X)-1)
+
 typedef struct st_lex_string
 {
   char *str;

--- 1.55/mysql-test/r/information_schema.result	Tue Jun  7 11:30:59 2005
+++ 1.56/mysql-test/r/information_schema.result	Thu Jun 16 12:11:47 2005
@@ -823,3 +823,12 @@
 drop user user1@localhost, user2@localhost, user3@localhost, user4@localhost;
 use test;
 drop database mysqltest;
+create procedure p1 () modifies sql data set @a = 5;
+create procedure p2 () set @a = 5;
+select sql_data_access from information_schema.routines
+where specific_name like 'p%';
+sql_data_access
+MODIFIES SQL DATA
+CONTAINS SQL
+drop procedure p1;
+drop procedure p2;

--- 1.38/mysql-test/t/information_schema.test	Tue Jun  7 11:31:00 2005
+++ 1.39/mysql-test/t/information_schema.test	Thu Jun 16 12:11:48 2005
@@ -542,3 +542,13 @@
 drop user user1@localhost, user2@localhost, user3@localhost, user4@localhost;
 use test;
 drop database mysqltest;
+
+#
+# Bug #11055 information_schema: routines.sql_data_access has wrong value
+#
+create procedure p1 () modifies sql data set @a = 5;
+create procedure p2 () set @a = 5;
+select sql_data_access from information_schema.routines
+where specific_name like 'p%';
+drop procedure p1;
+drop procedure p2;