diff options
| author | unknown <bar@mysql.com> | 2007-03-01 16:06:29 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2007-03-01 16:06:29 +0400 |
| commit | 783634d6d4e70c3808e28d1837287c65672f2eec (patch) | |
| tree | 527edf446c9cddc54b4cdca85dae8c14113c018d /sql/sql_class.h | |
| parent | db30ee2642231f27c5b870066e337b2105f83cba (diff) | |
| parent | 4a83cd38eae270a20bbd257cbd3b986dbc6aab31 (diff) | |
| download | mariadb-git-783634d6d4e70c3808e28d1837287c65672f2eec.tar.gz | |
Merge mysql.com:/home/bar/mysql-5.0.merge
into mysql.com:/home/bar/mysql-5.1-rpl
mysql-test/r/mysqlbinlog.result:
Auto merged
mysql-test/t/mysqlbinlog.test:
Auto merged
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
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 1f5f7aedbb4..5b507713814 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -1656,6 +1656,7 @@ public: bool opt_enclosed; bool dumpfile; ulong skip_lines; + CHARSET_INFO *cs; sql_exchange(char *name,bool dumpfile_flag); }; |