mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-22 08:15:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

merged

Browse source 
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
This commit is contained in:
unknown 2005-01-06 19:32:16 +02:00
commit 382cc831de
15 changed files with 184 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sql-common/client.c
View file

@ -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: