diff options
| author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-12-14 14:19:30 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-12-14 14:19:30 +0400 |
| commit | c8b678ac087e271dcd17ecaf5856dfa53d98656f (patch) | |
| tree | 2070749f232b426f7309a6d8f461715a45475469 /sql/log_event.h | |
| parent | 750dd5ed048d9ee339cd250cea30888daf005572 (diff) | |
| parent | c423ecc0a755646fd3ed4a2fc03450dbc49c528e (diff) | |
| download | mariadb-git-c8b678ac087e271dcd17ecaf5856dfa53d98656f.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql.com:/usr/home/bar/mysql-5.0.b22645
mysql-test/t/disabled.def:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
mysql-test/r/mysqlbinlog.result:
After merge fix
mysql-test/t/mysqlbinlog.test:
After merge fix
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index d5da90c0458..a44e3476c41 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -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 |