diff options
| author | unknown <serg@sergbook.mysql.com> | 2005-01-06 19:32:16 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2005-01-06 19:32:16 +0200 |
| commit | b74ac39f6ee1cdf97ba1b748dfa48f7a481978da (patch) | |
| tree | bc5f2396178536c669ed27714be84b79612c0f6b /sql-common | |
| parent | 52a756ce715ed9eea9c8c545bee1da5e92e95e7a (diff) | |
| parent | 18cb4bda507766d028f46f4369ab836aa7ee1462 (diff) | |
| download | mariadb-git-b74ac39f6ee1cdf97ba1b748dfa48f7a481978da.tar.gz | |
merged
BitKeeper/etc/ignore:
auto-union
include/my_pthread.h:
Auto merged
innobase/os/os0file.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
merged manually
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 0ff98102da9..9e08e8c0f59 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -880,7 +880,7 @@ static const char *default_options[]= "connect-timeout", "local-infile", "disable-local-infile", "replication-probe", "enable-reads-from-master", "repl-parse-query", "ssl-cipher", "max-allowed-packet", "protocol", "shared-memory-base-name", - "multi-results", "multi-queries", "secure-auth", + "multi-results", "multi-statements", "multi-queries", "secure-auth", "report-data-truncation", NullS }; @@ -1087,12 +1087,13 @@ void mysql_read_default_options(struct st_mysql_options *options, options->client_flag|= CLIENT_MULTI_RESULTS; break; case 31: + case 32: options->client_flag|= CLIENT_MULTI_STATEMENTS | CLIENT_MULTI_RESULTS; break; - case 32: /* secure-auth */ + case 33: /* secure-auth */ options->secure_auth= TRUE; break; - case 33: /* report-data-truncation */ + case 34: /* report-data-truncation */ options->report_data_truncation= opt_arg ? test(atoi(opt_arg)) : 1; break; default: |