database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-22 19:52:58 +03:00
Code Activity

Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943

Browse Source 
into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my51-bug22943


sql-common/client.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
This commit is contained in:
unknown
2007-01-29 14:35:09 +01:00
parent 1d82f97c83 7620e066db
commit a067100e60
9 changed files with 72 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/mysql_priv.h
View File

@@ -87,6 +87,9 @@ void sql_kill(THD *thd, ulong id, bool only_kill_query);
bool net_request_file(NET* net, const char* fname);
char* query_table_status(THD *thd,const char *db,const char *table_name);
void net_set_write_timeout(NET *net, uint timeout);
void net_set_read_timeout(NET *net, uint timeout);
#define x_free(A) { my_free((gptr) (A),MYF(MY_WME | MY_FAE | MY_ALLOW_ZERO_PTR)); }
#define safeFree(x) { if(x) { my_free((gptr) x,MYF(0)); x = NULL; } }
#define PREV_BITS(type,A) ((type) (((type) 1 << (A)) -1))