mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 04:05:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch

Browse source 
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
This commit is contained in:
unknown 2007-12-20 12:32:16 -08:00
commit 77538eeb46
3 changed files with 46 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/client_priv.h
View file

@ -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,