diff options
| author | unknown <guilhem@mysql.com> | 2005-02-03 18:55:29 +0100 |
|---|---|---|
| committer | unknown <guilhem@mysql.com> | 2005-02-03 18:55:29 +0100 |
| commit | 1497328caf061671edf68ecbb42279f616f89ac1 (patch) | |
| tree | 2891452f31e3bf181f0e2ab20d647025479eb8a2 /client | |
| parent | 4b027f5b998e9409449d4370df790040a911d13a (diff) | |
| parent | 868331406b531249196c4c246346c873e0e87bff (diff) | |
| download | mariadb-git-1497328caf061671edf68ecbb42279f616f89ac1.tar.gz | |
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/mysql_src/mysql-5.0-clean
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index caf126f2830..0afd4074284 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -488,6 +488,15 @@ end: static struct my_option my_long_options[] = { + /* + mysqlbinlog needs charsets knowledge, to be able to convert a charset + number found in binlog to a charset name (to be able to print things + like this: + SET @`a`:=_cp850 0x4DFC6C6C6572 COLLATE `cp850_general_ci`; + */ + {"character-sets-dir", OPT_CHARSETS_DIR, + "Directory where character sets are.", (gptr*) &charsets_dir, + (gptr*) &charsets_dir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, #ifndef DBUG_OFF {"debug", '#', "Output debug log.", (gptr*) &default_dbug_option, (gptr*) &default_dbug_option, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0}, |