summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-12-23 14:52:59 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-12-23 14:52:59 +0200
commit0aa02567dd62d96467f84ba96cc67b103f63c9e0 (patch)
tree6c379b5f7d84fdb8e724907448a4f015d89881f6 /client
parent04741dc736e803b0a91c76d19de464e25b4a1977 (diff)
parentfa1aef39ebc7d84d24d4e3d2124f982526632ee9 (diff)
downloadmariadb-git-0aa02567dd62d96467f84ba96cc67b103f63c9e0.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'client')
-rw-r--r--client/mysqlslap.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c
index ed5e20ca18c..c44bf8446f9 100644
--- a/client/mysqlslap.c
+++ b/client/mysqlslap.c
@@ -1177,9 +1177,6 @@ get_options(int *argc,char ***argv)
if (debug_check_flag)
my_end_arg= MY_CHECK_ERROR;
- if (!user)
- user= (char *)"root";
-
/*
If something is created and --no-drop is not specified, we drop the
schema.