diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 10:20:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 10:20:20 +0300 |
| commit | 28f01f82e1cb682566017b52017469be7638dd49 (patch) | |
| tree | d496cb0936d25973b95f6eb591508c2e493032b8 /libmysqld | |
| parent | a3099a3b4a394da360b5c1e7ae6dc985ae2f7f2f (diff) | |
| parent | 80ed136e6dd4a021b1fc9b7bd7077bf989c3d247 (diff) | |
| download | mariadb-git-bb-10.6-merge.tar.gz | |
WIP merge 10.5 to 10.6bb-10.6-merge
FIXME: Disabled tests due to upgrading libmariadb:
main.mysql_client_test main.mysql_client_test_nonblock main.mysql_client_test_comp
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/libmysql.c b/libmysqld/libmysql.c index 9a17b9b4f09..e131a92b01e 100644 --- a/libmysqld/libmysql.c +++ b/libmysqld/libmysql.c @@ -512,7 +512,7 @@ my_bool handle_local_infile(MYSQL *mysql, const char *net_filename) if (my_net_write(net, (uchar*) buf, readcount)) { DBUG_PRINT("error", - ("Lost connection to MySQL server during LOAD DATA of local file")); + ("Lost connection to server during LOAD DATA of local file")); set_mysql_error(mysql, CR_SERVER_LOST, unknown_sqlstate); goto err; } |