bk commit into 5.1 tree (lars:1.2164)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann 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.2164 06/05/18 21:40:52 lars@stripped +5 -0
  After merge fixes

  sql/sql_base.cc
    1.324 06/05/18 21:40:39 lars@stripped +8 -3
    After merge fixes

  sql/mysql_priv.h
    1.404 06/05/18 21:40:35 lars@stripped +0 -11
    After merge fixes

  mysql-test/t/rpl_temporary.test
    1.24 06/05/18 21:40:34 lars@stripped +1 -1
    After merge fixes

  mysql-test/r/rpl_temporary.result
    1.29 06/05/18 21:40:31 lars@stripped +0 -1
    After merge fixes

  mysql-test/r/rpl_stm_until.result
    1.26 06/05/18 21:40:31 lars@stripped +9 -9
    After merge fixes

# 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:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-new

--- 1.403/sql/mysql_priv.h	2006-05-18 18:08:17 +02:00
+++ 1.404/sql/mysql_priv.h	2006-05-18 21:40:35 +02:00
@@ -1937,17 +1937,6 @@
 }
 
 /*
-  is_user_table()
-  return true if the table was created explicitly
-*/
-
-inline bool is_user_table(TABLE * table)
-{
-  const char *name= table->s->table_name;
-  return strncmp(name, tmp_file_prefix, tmp_file_prefix_length);
-}
-
-/*
   Some functions that are different in the embedded library and the normal
   server
 */

--- 1.323/sql/sql_base.cc	2006-05-18 18:38:16 +02:00
+++ 1.324/sql/sql_base.cc	2006-05-18 21:40:39 +02:00
@@ -1183,7 +1183,13 @@
 
 void close_temporary_tables(THD *thd)
 {
-  TABLE *table;
+  TABLE *next,
+    *prev_table /* prev link is not maintained in TABLE's double-linked list */,
+    *table;
+  char *query= (gptr) 0, *end;
+  uint query_buf_size, max_names_len; 
+  bool found_user_tables;
+
   if (!thd->temporary_tables)
     return;
   
@@ -1283,7 +1289,7 @@
            table= next)
       {
         end_cur= strxmov(end_cur, "`", table->s->db.str, "`.`",
-                      table->s->table_name.str, "`,", NullS);
+                         table->s->table_name.str, "`,", NullS);
         next= table->next;
         close_temporary(table, 1, 1);
       }
@@ -1310,7 +1316,6 @@
   }
   thd->temporary_tables=0;
 }
-
 
 /*
   Find table in list.

--- 1.25/mysql-test/r/rpl_stm_until.result	2006-05-18 18:38:14 +02:00
+++ 1.26/mysql-test/r/rpl_stm_until.result	2006-05-18 21:40:31 +02:00
@@ -26,7 +26,7 @@
 Master_Port	MASTER_MYPORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	776
+Read_Master_Log_Pos	780
 Relay_Log_File	slave-relay-bin.000004
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -41,11 +41,11 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	319
+Exec_Master_Log_Pos	323
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-bin.000001
-Until_Log_Pos	319
+Until_Log_Pos	323
 Master_SSL_Allowed	No
 Master_SSL_CA_File	
 Master_SSL_CA_Path	
@@ -67,7 +67,7 @@
 Master_Port	MASTER_MYPORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	776
+Read_Master_Log_Pos	780
 Relay_Log_File	slave-relay-bin.000004
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -82,7 +82,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	319
+Exec_Master_Log_Pos	323
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-no-such-bin.000001
@@ -106,7 +106,7 @@
 Master_Port	MASTER_MYPORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	776
+Read_Master_Log_Pos	780
 Relay_Log_File	slave-relay-bin.000004
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -121,7 +121,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	608
+Exec_Master_Log_Pos	612
 Relay_Log_Space	#
 Until_Condition	Relay
 Until_Log_File	slave-relay-bin.000004
@@ -143,7 +143,7 @@
 Master_Port	MASTER_MYPORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	776
+Read_Master_Log_Pos	780
 Relay_Log_File	slave-relay-bin.000004
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -158,7 +158,7 @@
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	776
+Exec_Master_Log_Pos	780
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-bin.000001

--- 1.28/mysql-test/r/rpl_temporary.result	2006-05-18 18:08:14 +02:00
+++ 1.29/mysql-test/r/rpl_temporary.result	2006-05-18 21:40:31 +02:00
@@ -93,7 +93,6 @@
 create temporary table t102 (id int);
 set @@session.pseudo_thread_id=200;
 create temporary table t201 (id int);
-create temporary table `t``201` (id int);
 create temporary table `#sql_not_user_table202` (id int);
 set @@session.pseudo_thread_id=300;
 create temporary table t301 (id int);

--- 1.23/mysql-test/t/rpl_temporary.test	2006-05-18 18:38:15 +02:00
+++ 1.24/mysql-test/t/rpl_temporary.test	2006-05-18 21:40:34 +02:00
@@ -170,7 +170,7 @@
 create temporary table t102 (id int);
 set @@session.pseudo_thread_id=200;
 create temporary table t201 (id int);
-create temporary table `t``201` (id int);
+#create temporary table `t``201` (id int);
 # emulate internal temp table not to come to binlog
 create temporary table `#sql_not_user_table202` (id int);
 set @@session.pseudo_thread_id=300;