After merge fixes

mysql-test/r/rpl_stm_until.result

@@ -26,7 +26,7 @@ Master_User	root
 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 @@ Replicate_Wild_Ignore_Table
 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_User	root
 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 @@ Replicate_Wild_Ignore_Table
 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_User	root
 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 @@ Replicate_Wild_Ignore_Table
 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_User	root
 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 @@ Replicate_Wild_Ignore_Table
 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

mysql-test/r/rpl_temporary.result

@@ -93,7 +93,6 @@ create temporary table t101 (id int);
 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);

mysql-test/t/rpl_temporary.test

@@ -170,7 +170,7 @@ create temporary table t101 (id int);
 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;

sql/mysql_priv.h

@@ -1936,17 +1936,6 @@ inline int hexchar_to_int(char c)
   return -1;
 }
 
-/*
-  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

sql/sql_base.cc

@@ -1183,7 +1183,13 @@ static inline uint  tmpkeyval(THD *thd, TABLE *table)
 
 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 @@ void close_temporary_tables(THD *thd)
            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);
       }
@@ -1311,7 +1317,6 @@ void close_temporary_tables(THD *thd)
   thd->temporary_tables=0;
 }
 
-
 /*
   Find table in list.