database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge with 4.0

Browse Source
This commit is contained in:
monty@narttu.mysql.fi
2003-03-16 19:17:54 +02:00
parent ce7db2827e ba46c7289c
commit a434bca704
196 changed files with 11754 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_class.h
View File

@ -398,7 +398,8 @@ struct system_variables
ulong pseudo_thread_id;
my_bool log_warnings;
my_bool low_priority_updates;
my_bool low_priority_updates;
my_bool new_mode;
CONVERT *convert_set;
CHARSET_INFO *thd_charset;
@ -447,8 +448,9 @@ public:
db - currently selected database
ip - client IP
*/
char *host,*user,*priv_user,*db,*ip;
/* remote (peer) port */
uint16 peer_port;
/* Points to info-string that will show in SHOW PROCESSLIST */
const char *proc_info;
/* points to host if host is available, otherwise points to ip */
@ -996,7 +998,7 @@ class multi_update : public select_result
{
TABLE_LIST *all_tables, *update_tables, *table_being_updated;
THD *thd;
TABLE **tmp_tables, *main_table;
TABLE **tmp_tables, *main_table, *table_to_update;
TMP_TABLE_PARAM *tmp_table_param;
ha_rows updated, found;
List <Item> *fields, *values;