database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

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

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


mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/mysql_priv.h:
  manual merge, a comment added
This commit is contained in:
unknown
2006-05-12 21:38:41 +03:00
parent daebc0d63b c212cb25ed
commit ee1a284416
4 changed files with 103 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/mysql_priv.h
View File

@ -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;
@ -1283,6 +1288,17 @@ inline void write_binlog_with_system_charset(THD * thd, Query_log_event * qinfo)
thd->variables.character_set_client= cs_save;
}
/*
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