diff options
| author | unknown <bar@mysql.com> | 2007-02-28 17:17:06 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2007-02-28 17:17:06 +0400 |
| commit | de61d5b0d5eeb32be7df8fb3dd7adb2b13aa3d16 (patch) | |
| tree | f40ea4d95e15ebf63594a870f9ed2edefe4b5de1 /sql/log_event.h | |
| parent | 9c8637dc4cb97f97eec964f64aaefe906d65f614 (diff) | |
| parent | c3a3aff54feeb194e0217249305f74f18021099a (diff) | |
| download | mariadb-git-de61d5b0d5eeb32be7df8fb3dd7adb2b13aa3d16.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql.com:/home/bar/mysql-5.0.b15126
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_yacc.yy:
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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 98c323fb4c1..a1e7adb6487 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -272,6 +272,7 @@ struct sql_ex_info #define Q_LC_TIME_NAMES_CODE 7 +#define Q_CHARSET_DATABASE_CODE 8 /* Intvar event post-header */ #define I_TYPE_OFFSET 0 @@ -509,10 +510,11 @@ typedef struct st_print_event_info 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; + uint charset_database_number; st_print_event_info() :flags2_inited(0), sql_mode_inited(0), auto_increment_increment(1),auto_increment_offset(1), charset_inited(0), - lc_time_names_number(0) + lc_time_names_number(0), charset_database_number(0) { /* Currently we only use static PRINT_EVENT_INFO objects, so zeroed at @@ -797,6 +799,7 @@ public: uint time_zone_len; /* 0 means uninited */ const char *time_zone_str; uint lc_time_names_number; /* 0 means en_US */ + uint charset_database_number; #ifndef MYSQL_CLIENT |