diff options
| author | unknown <monty@donna.mysql.com> | 2000-11-20 02:57:02 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-11-20 02:57:02 +0200 |
| commit | 89ee326c1d27f3bee4acba67060a475811ebd842 (patch) | |
| tree | d3f52866508b583c2d4549b66887b4b50aa9fe22 /libmysql/libmysql.c | |
| parent | 5dae19b394e3385c0e48d896fec1174437f2308a (diff) | |
| download | mariadb-git-89ee326c1d27f3bee4acba67060a475811ebd842.tar.gz | |
Bug fix for NATURAL JOIN, Split manual sections and more statistic variables
Docs/manual.texi:
Split BDB into different sections
Added MySQL developers section
Changed an SQL to a SQL
include/my_sys.h:
More statistic variables
libmysql/libmysql.c:
Added option "interactive-timeout"
mysys/mf_tempfile.c:
More statistic variables
mysys/my_static.c:
More statistic variables
sql-bench/crash-me.sh:
Fixed bug in truncate table test
sql-bench/limits/mysql-3.23.cfg:
Updated to crash-me 1.51
sql-bench/limits/mysql.cfg:
Updated to crash-me 1.51
sql/filesort.cc:
More statistics
sql/mysql_priv.h:
More statistics
sql/mysqld.cc:
More statistics
sql/sql_base.cc:
Fix for NATURAL JOIN
sql/sql_delete.cc:
cleanup + Added logging if one doesn't use index
sql/sql_parse.cc:
Logging if one doesn't use index
sql/sql_select.cc:
Logging if one doesn't use index
sql/sql_update.cc:
cleanup + Added logging if one doesn't use index
sql/structs.h:
Fix for NATURAL JOIN
support-files/my-huge.cnf.sh:
Added interactive-timeout to [mysqlhotcopy]
support-files/my-large.cnf.sh:
Added interactive-timeout to [mysqlhotcopy]
support-files/my-medium.cnf.sh:
Added interactive-timeout to [mysqlhotcopy]
support-files/my-small.cnf.sh:
Added interactive-timeout to [mysqlhotcopy]
Diffstat (limited to 'libmysql/libmysql.c')
| -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])); } |