summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 634e7bad738..4bbbb629d20 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1276,6 +1276,19 @@ inline int hexchar_to_int(char c)
}
/*
+ 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;
+ thd->variables.character_set_client= system_charset_info;
+ mysql_bin_log.write(qinfo);
+ thd->variables.character_set_client= cs_save;
+}
+
+/*
is_user_table()
return true if the table was created explicitly
*/
@@ -1286,8 +1299,6 @@ inline bool is_user_table(TABLE * table)
return strncmp(name, tmp_file_prefix, tmp_file_prefix_length);
}
-
-
/*
Some functions that are different in the embedded library and the normal
server