summaryrefslogtreecommitdiff
path: root/client/mysqlimport.c
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2019-07-18 15:32:22 +0300
committerMonty <monty@mariadb.org>2019-07-18 15:32:22 +0300
commit47334649752e109360c9e22b8f8019a0df51fe93 (patch)
tree343a69f76e7aee854ed7c8c399b94fd0a05a9465 /client/mysqlimport.c
parent5a95a33e309d0b2c6bc0f938ad925e3f74b0f921 (diff)
downloadmariadb-git-47334649752e109360c9e22b8f8019a0df51fe93.tar.gz
Fixed that mariadb-# binaries reads their corresponding entry from my.cnf
- Added mariadb-# to load_default_groups to all mariadb-# scripts and mariadb-binaries. - Added mariadbd and mariadbd-"version" to load_default_groups for the mysqld/mariadb server - Added mariadb-client to load_default_groups for the mysql/mariadb client Other things - Ignored mysql-test/lib/My/SafeProcess/wsrep_check_version - mysql_install_db will now automatically detect if run from srcdir
Diffstat (limited to 'client/mysqlimport.c')
-rw-r--r--client/mysqlimport.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index cfdb183414a..67dc11d7117 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -187,7 +187,8 @@ static struct my_option my_long_options[] =
static const char *load_default_groups[]=
-{ "mysqlimport","client", "client-server", "client-mariadb", 0 };
+{ "mysqlimport", "mariadb-import", "client", "client-server", "client-mariadb",
+ 0 };
static void print_version(void)