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 abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.0.b22645
This commit is contained in:
bar@mysql.com/bar.intranet.mysql.r18.ru
2006-12-14 14:19:30 +04:00
parent d78bcf2c4a b66f34bd19
commit cedafa8dec
7 changed files with 84 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/log_event.h
View File

@ -271,6 +271,8 @@ struct sql_ex_info
*/
#define Q_CATALOG_NZ_CODE 6
#define Q_LC_TIME_NAMES_CODE 7
/* Intvar event post-header */
#define I_TYPE_OFFSET 0
@ -507,9 +509,11 @@ typedef struct st_print_event_info
bool charset_inited;
char charset[6]; // 3 variables, each of them storable in 2 bytes
char time_zone_str[MAX_TIME_ZONE_NAME_LENGTH];
uint lc_time_names_number;
st_print_event_info()
:flags2_inited(0), sql_mode_inited(0),
auto_increment_increment(1),auto_increment_offset(1), charset_inited(0)
auto_increment_increment(1),auto_increment_offset(1), charset_inited(0),
lc_time_names_number(0)
{
/*
Currently we only use static PRINT_EVENT_INFO objects, so zeroed at
@ -786,6 +790,7 @@ public:
char charset[6];
uint time_zone_len; /* 0 means uninited */
const char *time_zone_str;
uint lc_time_names_number; /* 0 means en_US */
#ifndef MYSQL_CLIENT