Merge dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/5.1

into  dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/FIXES/5.1/bug19188_graved_temp


mysql-test/r/rpl_temporary.result:
  use local.
mysql-test/t/rpl_temporary.test:
  use local.
sql/sql_base.cc:
  use local
sql/mysql_priv.h:
  added is_user_table

mysql-test/r/rpl_temporary.result

@@ -93,6 +93,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 `#sql_not_user_table202` (id int);
 set @@session.pseudo_thread_id=300;
 create temporary table t301 (id int);
@@ -104,7 +105,4 @@ select * from t1 /* must be 1 */;
 f
 1
 drop table t1;
-select * from t1;
-a
-1
-drop table t1;
+End of 5.1 tests

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;
@@ -190,17 +190,5 @@ select * from t1 /* must be 1 */;
 
 connection master; 
 drop table t1;
+--echo End of 5.1 tests
 
-#
-#14157: utf8 encoding in binlog without set character_set_client
-#
---exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=latin1 test -e 'create table t1 (a int); set names latin1; create temporary table `äöüÄÖÜ` (a int); insert into `äöüÄÖÜ` values (1); insert into t1 select * from `äöüÄÖÜ`'
-
-sync_slave_with_master;
-#connection slave;
-select * from t1;
-
-connection master; 
-drop table t1;
-
-# End of 5.0 tests

sql/mysql_priv.h

@@ -1970,6 +1970,17 @@ 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.str;
+  return strncmp(name, tmp_file_prefix, tmp_file_prefix_length);
+}
+
 /*
   Some functions that are different in the embedded library and the normal
   server