summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-12-16 07:47:17 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-12-16 07:47:17 +0200
commit28c89b7151bc3ebd7a3459e85f4c9b5e73529629 (patch)
treece50324e5d1054f59a7178bfdb426189998baf52 /sql-common
parent745fd4b39f8aff6300682502ed2ddf61ee343866 (diff)
parent8fa759a5762733d9f8a4050437fadcd255ecd1a2 (diff)
downloadmariadb-git-28c89b7151bc3ebd7a3459e85f4c9b5e73529629.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index e0734b7dc18..4e63b3e9951 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -3218,7 +3218,7 @@ my_bool mysql_reconnect(MYSQL *mysql)
if (ctxt)
my_context_install_suspend_resume_hook(ctxt, NULL, NULL);
- DBUG_PRINT("info", ("reconnect succeded"));
+ DBUG_PRINT("info", ("reconnect succeeded"));
tmp_mysql.reconnect= 1;
tmp_mysql.free_me= mysql->free_me;