diff options
| author | unknown <brian@zim.(none)> | 2007-12-20 12:32:16 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2007-12-20 12:32:16 -0800 |
| commit | 77538eeb46bb8d61d48981af4e9eba024e9c9e41 (patch) | |
| tree | be163b35724401d8fe39e083383c5b99cbb3c398 /client/client_priv.h | |
| parent | 7213ca204dc3d10f751ca2507321eede1238d6cb (diff) | |
| parent | 9603ebc45c684a895bf2413a05ef01772851e507 (diff) | |
| download | mariadb-git-77538eeb46bb8d61d48981af4e9eba024e9c9e41.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
into zim.(none):/home/bk/mysql-5.1-arch
client/client_priv.h:
Auto merged
client/mysqlslap.c:
Auto merged
mysql-test/r/mysqlslap.result:
Auto merged
Diffstat (limited to 'client/client_priv.h')
| -rw-r--r-- | client/client_priv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/client/client_priv.h b/client/client_priv.h index c205d07c34c..71d6ce8a635 100644 --- a/client/client_priv.h +++ b/client/client_priv.h @@ -60,7 +60,6 @@ enum options_client OPT_USE_THREADS, OPT_IMPORT_USE_THREADS, OPT_MYSQL_NUMBER_OF_QUERY, - OPT_MYSQL_PRESERVE_SCHEMA, OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE, OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA, OPT_SLAP_CSV, OPT_SLAP_CREATE_STRING, |