diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-03-18 17:03:43 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-03-18 17:03:43 +0200 |
| commit | 0fae0335d46c5f1757b59926be60a41eb0224837 (patch) | |
| tree | 600e29476bf817514a5b303b3f4f5988d964bf38 /tests | |
| parent | ce675406ca8dbc1532a908803a1371de8432d466 (diff) | |
| download | mariadb-git-0fae0335d46c5f1757b59926be60a41eb0224837.tar.gz | |
Ensure that all clients reads the appropriate 'client', client-mariadb and 'mariadb' sections from my.cnf
The mysqld server and all clients now reads the new client-server section
Fixed that mysqldumpslow supports new slow log formats and new mysqld --slow- options
client/mysql.cc:
Read also client-server and client-mariadb sections.
client/mysql_upgrade.c:
Read also client-server and client-mariadb sections.
client/mysqladmin.cc:
Read also client-server and client-mariadb sections.
client/mysqlbinlog.cc:
Read also client-server and client-mariadb sections.
client/mysqlcheck.c:
Read also client-server and client-mariadb sections.
client/mysqldump.c:
Read also client-server and client-mariadb sections.
client/mysqlimport.c:
Read also client-server and client-mariadb sections.
client/mysqlshow.c:
Read also client-server and client-mariadb sections.
client/mysqltest.cc:
Read also client-server and client-mariadb sections.
extra/my_print_defaults.c:
Updated help text
scripts/mysql_fix_privilege_tables.sh:
Read also sections client client-server client-mariadb
scripts/mysql_install_db.pl.in:
Also allow --data=* option
Read also groups mariadb, server and client-server.
scripts/mysql_install_db.sh:
Also allow --data=* option
Read also groups mariadb, server and client-server.
Added --lose-skip-pbxt to bootstrap
scripts/mysql_secure_installation.sh:
Read also groups client-server and client-mariadb
scripts/mysqld_multi.sh:
Read also group mariadb
scripts/mysqld_safe.sh:
Read also groups mariadb server and client-server
scripts/mysqldumpslow.sh:
Fixed to support new slow log formats
Added sorting on -ae (aggregated number of retreived rows) and e (retrieved rows)
Read also group 'mariadb'
If there is many instances of same option, use last one.
Get slow log file from options log-slow-queries=filename or query-log-file=filename
Added support for future --log-basename option
sql-common/client.c:
Read also groups 'client-server' and 'client-mariadb'
tests/mysql_client_test.c:
Read also groups 'client-server' and 'client-mariadb'
tests/thread_test.c:
Read also groups 'client-server' and 'client-mariadb'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 3 | ||||
| -rw-r--r-- | tests/thread_test.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index d1224a7f724..759eac04fa3 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -18446,7 +18446,8 @@ static void test_bug47485() Read and parse arguments and MySQL options from my.cnf */ -static const char *client_test_load_default_groups[]= { "client", 0 }; +static const char *client_test_load_default_groups[]= +{ "client", "client-server", "client-mariadb", 0 }; static char **defaults_argv; static struct my_option client_test_long_options[] = diff --git a/tests/thread_test.c b/tests/thread_test.c index 8e1c58ebbec..0944cbc0970 100644 --- a/tests/thread_test.c +++ b/tests/thread_test.c @@ -123,7 +123,8 @@ static struct my_option my_long_options[] = }; -static const char *load_default_groups[]= { "client",0 }; +static const char *load_default_groups[]= +{ "client", "client-server", "client-mariadb", 0 }; static void usage() { |