diff options
| author | monty@donna.mysql.com <> | 2000-11-20 02:57:02 +0200 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-11-20 02:57:02 +0200 |
| commit | 61fd6baf4b466e52192f68fec8e09aa9cca7ead4 (patch) | |
| tree | d3f52866508b583c2d4549b66887b4b50aa9fe22 /libmysql | |
| parent | b31d0768794e964852562c0ba307e6eea35f101b (diff) | |
| download | mariadb-git-61fd6baf4b466e52192f68fec8e09aa9cca7ead4.tar.gz | |
Bug fix for NATURAL JOIN, Split manual sections and more statistic variables
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 5cdbf12dfc4..c48b3e61403 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -684,8 +684,8 @@ mysql_free_result(MYSQL_RES *result) static const char *default_options[]= {"port","socket","compress","password","pipe", "timeout", "user", "init-command", "host", "database", "debug", "return-found-rows", - "ssl_key" ,"ssl_cert" ,"ssl_ca" ,"ssl_capath", - "character-set-dir", "default-character-set", + "ssl-key" ,"ssl-cert" ,"ssl-ca" ,"ssl-capath", + "character-set-dir", "default-character-set", "interactive-timeout", NullS }; @@ -815,6 +815,9 @@ static void mysql_read_default_options(struct st_mysql_options *options, my_free(options->charset_name,MYF(MY_ALLOW_ZERO_PTR)); options->charset_name = my_strdup(opt_arg, MYF(MY_WME)); break; + case 19: /* Interactive-timeout */ + options->client_flag|=CLIENT_INTERACTIVE; + break; default: DBUG_PRINT("warning",("unknown option: %s",option[0])); } |