summaryrefslogtreecommitdiff
path: root/client/mysqlshow.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/mysqlshow.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/mysqlshow.c')
-rw-r--r--client/mysqlshow.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 4e2f9e83340..db5c2bbbbe6 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -56,7 +56,8 @@ static void print_res_top(MYSQL_RES *result);
static void print_res_row(MYSQL_RES *result,MYSQL_ROW cur);
static const char *load_default_groups[]=
-{ "mysqlshow","client", "client-server", "client-mariadb", 0 };
+{ "mysqlshow", "mariadb-show", "client", "client-server", "client-mariadb",
+ 0 };
static char * opt_mysql_unix_port=0;
int main(int argc, char **argv)