Merge mysql.com:/net/nb/home/elkin/MySQL/FIXES/4.1-bug19188_tmp_name

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/4.1

1 files changed, 16 insertions, 0 deletions

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index aab65bca82f..4bbbb629d20 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1275,6 +1275,11 @@ inline int hexchar_to_int(char c)
   return -1;
 }
 
+/*
+  wrapper to use instead of mysql_bin_log.write when
+  query is generated by the server using system_charset encoding
+*/
+
 inline void write_binlog_with_system_charset(THD * thd, Query_log_event * qinfo)
 {
   CHARSET_INFO * cs_save= thd->variables.character_set_client;
@@ -1284,6 +1289,17 @@ inline void write_binlog_with_system_charset(THD * thd, Query_log_event * qinfo)
 }
 
 /*
+  is_user_table()
+  return true if the table was created explicitly
+*/
+
+inline bool is_user_table(TABLE * table)
+{
+  const char *name= table->real_name;
+  return strncmp(name, tmp_file_prefix, tmp_file_prefix_length);
+}
+
+/*
   Some functions that are different in the embedded library and the normal
   server
 */