diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-09-27 20:00:40 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-09-27 20:00:40 +0300 |
| commit | 6f296a01ac39f7d10774fd3d93b5633f31ce99c7 (patch) | |
| tree | b1739519539f0be37309a5bf39efeb9b45e3d7f0 /client | |
| parent | f4afcec393e9c75531220c1fe1f5d387891549fa (diff) | |
| download | mariadb-git-6f296a01ac39f7d10774fd3d93b5633f31ce99c7.tar.gz | |
Fixed merge problems.
BitKeeper/etc/ignore:
Added libmysql_r/client_settings.h libmysqld/scheduler.cc libmysqld/sql_connect.cc libmysqld/sql_tablespace.cc to the ignore list
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index e530c235b41..fdee137fa98 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -64,7 +64,6 @@ enum { OPT_SKIP_SAFEMALLOC=OPT_MAX_CLIENT_OPTION, OPT_PS_PROTOCOL, OPT_SP_PROTOCOL, OPT_CURSOR_PROTOCOL, OPT_VIEW_PROTOCOL, OPT_MAX_CONNECT_RETRIES, OPT_MARK_PROGRESS, OPT_LOG_DIR, OPT_TAIL_LINES, - OPT_MAX_CONNECT_RETRIES, OPT_MARK_PROGRESS, OPT_LOG_DIR, OPT_GLOBAL_SUBST }; |