diff options
| author | unknown <jimw@mysql.com> | 2005-09-03 09:34:34 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-09-03 09:34:34 -0700 |
| commit | 3eb26b77354f99f64ad6664e417222c989097f3c (patch) | |
| tree | e1e63076eb27648aab310ae7fe98cd2e6e6757aa /sql-common | |
| parent | 80ea9db87bdef050f319a9a30e8a213bb099b451 (diff) | |
| parent | 813033338c451748a0e32af386d5b344940d6277 (diff) | |
| download | mariadb-git-3eb26b77354f99f64ad6664e417222c989097f3c.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-5.0-11787
into mysql.com:/home/jimw/my/mysql-5.0-clean
include/mysql.h:
Auto merged
sql-common/client.c:
Auto merged
client/mysqltest.c:
Resolve conflict
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 993978f132f..cc70bbc7523 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -2760,6 +2760,9 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg) case MYSQL_REPORT_DATA_TRUNCATION: mysql->options.report_data_truncation= test(*(my_bool *) arg); break; + case MYSQL_OPT_RECONNECT: + mysql->reconnect= *(my_bool *) arg; + break; default: DBUG_RETURN(1); } |