diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-12-14 16:45:48 +0400 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-12-14 16:45:48 +0400 |
| commit | e3ce6c4d6bb7bf155a9bf8a3ca9bb63b822ed665 (patch) | |
| tree | e26fa2c6cdd24b603f02b838222acc304452eb65 /sql/log_event.h | |
| parent | 9ef60daf784a8a1962306c997b16a2cb81a362d9 (diff) | |
| parent | 76bd00a9932713aaf33de8915051c47e7af2aa61 (diff) | |
| download | mariadb-git-e3ce6c4d6bb7bf155a9bf8a3ca9bb63b822ed665.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0.b22645
into mysql.com:/usr/home/bar/mysql-5.1.b22645
mysql-test/t/mysqlbinlog.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
mysql-test/t/disabled.def:
SCCS merged
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 76525bd3009..021ce938139 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 @@ -525,9 +527,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 @@ -829,6 +833,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 |