diff options
| author | serg@sergbook.mysql.com <> | 2005-01-06 19:32:16 +0200 |
|---|---|---|
| committer | serg@sergbook.mysql.com <> | 2005-01-06 19:32:16 +0200 |
| commit | f472cec17809bd2b9cbd1c73bf65bc171199ef70 (patch) | |
| tree | bc5f2396178536c669ed27714be84b79612c0f6b /sql-common/client.c | |
| parent | 15133e70ac963d1e45342b8b6dea841d3855cd7e (diff) | |
| parent | 03f64a63431043689332c6b633990c5bf6b0c535 (diff) | |
| download | mariadb-git-f472cec17809bd2b9cbd1c73bf65bc171199ef70.tar.gz | |
merged
Diffstat (limited to 'sql-common/client.c')
| -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: |