diff options
| author | unknown <paul@kite-hub.kitebird.com> | 2005-01-04 10:32:42 -0600 |
|---|---|---|
| committer | unknown <paul@kite-hub.kitebird.com> | 2005-01-04 10:32:42 -0600 |
| commit | 54d86c873689715b1e3199af28dcac384a310464 (patch) | |
| tree | e5e732dc62e370305f1d572fe3f9a81413a1f9fb /sql-common | |
| parent | a35b65375fc5b58c97ed3ea41a82b2feaf153dd4 (diff) | |
| download | mariadb-git-54d86c873689715b1e3199af28dcac384a310464.tar.gz | |
client.c:
Make multi-statements the preferred option name (to coincide
with the renaming of the CLIENT_MULTI_RESULTS symbol to
CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
for backward compatibility.
sql-common/client.c:
Make multi-statements the preferred option name (to coincide
with the renaming of the CLIENT_MULTI_RESULTS symbol to
CLIENT_MULTI_STATEMENTS). Continue to allow multi-queries
for backward compatibility.
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/client.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 87a781e0a0d..b6813ee4cfc 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -882,7 +882,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", NullS }; @@ -1088,9 +1088,10 @@ 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; default: |