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 /include/mysql.h | |
| 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 'include/mysql.h')
| -rw-r--r-- | include/mysql.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mysql.h b/include/mysql.h index 2ba41e6d367..c4b4e026e5b 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -146,7 +146,7 @@ enum mysql_option MYSQL_OPT_WRITE_TIMEOUT, MYSQL_OPT_USE_RESULT, MYSQL_OPT_USE_REMOTE_CONNECTION, MYSQL_OPT_USE_EMBEDDED_CONNECTION, MYSQL_OPT_GUESS_CONNECTION, MYSQL_SET_CLIENT_IP, MYSQL_SECURE_AUTH, - MYSQL_REPORT_DATA_TRUNCATION + MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_RECONNECT }; struct st_mysql_options { |