mirror of
https://github.com/MariaDB/server.git
synced 2026-05-04 22:25:32 +02:00
after merge fixes
strings/my_vsnprintf.c: %.#s support in my_vsnprintf BitKeeper/etc/ignore: Added EXCEPTIONS-CLIENT to the ignore list
This commit is contained in:
parent
945625ebaa
commit
ae2bf6275e
19 changed files with 98 additions and 88 deletions
|
|
@ -1037,7 +1037,7 @@ void mysql_read_default_options(struct st_mysql_options *options,
|
|||
options->client_flag&= ~CLIENT_LOCAL_FILES;
|
||||
break;
|
||||
case 22:
|
||||
options->client_flag&= CLIENT_LOCAL_FILES;
|
||||
options->client_flag&= ~CLIENT_LOCAL_FILES;
|
||||
break;
|
||||
case 23: /* replication probe */
|
||||
#ifndef TO_BE_DELETED
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue