bk commit into 5.1 tree (tomas:1.2092) BUG#17340

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2092 06/02/13 21:55:49 tomas@stripped +4 -0
  Bug #17340  	SHOW CREATE TABLE from second session crashes the server
  - no check was made that ndb thd object was allocated

  sql/sql_show.cc
    1.303 06/02/13 21:55:41 tomas@stripped +1 -1
    Bug #17340  	SHOW CREATE TABLE from second session crashes the server

  sql/handler.h
    1.191 06/02/13 21:55:41 tomas@stripped +1 -1
    Bug #17340  	SHOW CREATE TABLE from second session crashes the server

  sql/ha_ndbcluster.h
    1.119 06/02/13 21:55:41 tomas@stripped +1 -1
    Bug #17340  	SHOW CREATE TABLE from second session crashes the server

  sql/ha_ndbcluster.cc
    1.269 06/02/13 21:55:40 tomas@stripped +4 -4
    Bug #17340  	SHOW CREATE TABLE from second session crashes the server
    - no check was made that ndb thd object was allocated

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.190/sql/handler.h	2006-02-12 02:24:24 +01:00
+++ 1.191/sql/handler.h	2006-02-13 21:55:41 +01:00
@@ -1712,7 +1712,7 @@
   { return FALSE; }
   virtual char* get_foreign_key_create_info()
   { return(NULL);}  /* gets foreign key create string from InnoDB */
-  virtual char* get_tablespace_name()
+  virtual char* get_tablespace_name(THD *thd)
   { return(NULL);}  /* gets tablespace name from handler */
   /* used in ALTER TABLE; 1 if changing storage engine is allowed */
   virtual bool can_switch_engines() { return 1; }

--- 1.302/sql/sql_show.cc	2006-02-12 02:24:25 +01:00
+++ 1.303/sql/sql_show.cc	2006-02-13 21:55:41 +01:00
@@ -1138,7 +1138,7 @@
       to the CREATE TABLE statement
     */
 
-    if ((for_str= file->get_tablespace_name()))
+    if ((for_str= file->get_tablespace_name(thd)))
     {
       packet->append(" TABLESPACE ");
       packet->append(for_str, strlen(for_str));

--- 1.268/sql/ha_ndbcluster.cc	2006-02-13 14:20:23 +01:00
+++ 1.269/sql/ha_ndbcluster.cc	2006-02-13 21:55:40 +01:00
@@ -8915,9 +8915,9 @@
 /*
   get table space info for SHOW CREATE TABLE
 */
-char* ha_ndbcluster::get_tablespace_name()
+char* ha_ndbcluster::get_tablespace_name(THD *thd)
 {
-  Ndb *ndb= get_ndb();
+  Ndb *ndb= check_ndb_in_thd(thd);
   NDBDICT *ndbdict= ndb->getDictionary();
   NdbError ndberr;
   Uint32 id;
@@ -8941,11 +8941,11 @@
   }
 err:
   if (ndberr.status == NdbError::TemporaryError)
-    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
 			ER_GET_TEMPORARY_ERRMSG, ER(ER_GET_TEMPORARY_ERRMSG),
 			ndberr.code, ndberr.message, "NDB");
   else
-    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
+    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
 			ER_GET_ERRMSG, ER(ER_GET_ERRMSG),
 			ndberr.code, ndberr.message, "NDB");
   return 0;

--- 1.118/sql/ha_ndbcluster.h	2006-02-10 18:04:39 +01:00
+++ 1.119/sql/ha_ndbcluster.h	2006-02-13 21:55:41 +01:00
@@ -724,7 +724,7 @@
   uint set_up_partition_info(partition_info *part_info,
                              TABLE *table,
                              void *tab);
-  char* get_tablespace_name();
+  char* get_tablespace_name(THD *thd);
   int set_range_data(void *tab, partition_info* part_info);
   int set_list_data(void *tab, partition_info* part_info);
   int complemented_pk_read(const byte *old_data, byte *new_data,