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

Merged 4.1 into 5.0.

Browse Source
This commit is contained in:
pem@mysql.com
2003-04-16 23:23:23 +02:00
parent 462430ba55 03f3b34058
commit 386b0b91b2
97 changed files with 1927 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_class.h
View File

@ -379,9 +379,10 @@ struct system_variables
my_bool log_warnings;
my_bool low_priority_updates;
my_bool new_mode;
my_bool convert_result_charset;
CHARSET_INFO *thd_charset;
CHARSET_INFO *client_collation;
CHARSET_INFO *literal_collation;
CHARSET_INFO *result_collation;
};
void free_tmp_table(THD *thd, TABLE *entry);
@ -664,7 +665,7 @@ public:
net.report_error= 1;
DBUG_PRINT("error",("Fatal error set"));
}
inline CHARSET_INFO *charset() { return variables.thd_charset; }
inline CHARSET_INFO *charset() { return variables.client_collation; }
};
/*