diff options
| author | unknown <monty@mysql.com> | 2004-03-12 01:12:14 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-03-12 01:12:14 +0200 |
| commit | dd8b25510e11ca35c37bb9949810ac84c6d7ce29 (patch) | |
| tree | c0a17d040743869a3c5573eeaabb8a33a3224a2d /libmysql | |
| parent | a1d9e1eec4ff8e9e53567bb3606bc4605a952375 (diff) | |
| parent | bc9de3d4552f2294bad973d0b9fbe07de3d07c1d (diff) | |
| download | mariadb-git-dd8b25510e11ca35c37bb9949810ac84c6d7ce29.tar.gz | |
Merge with 3.23 to get patch for floor()
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_check.c:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index f86435712dc..f2d77d495c9 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -2112,8 +2112,8 @@ static my_bool mysql_reconnect(MYSQL *mysql) { /* Allow reconnect next time */ mysql->server_status&= ~SERVER_STATUS_IN_TRANS; - mysql->net.last_errno=CR_SERVER_GONE_ERROR; - strmov(mysql->net.last_error,ER(mysql->net.last_errno)); + mysql->net.last_errno= CR_SERVER_GONE_ERROR; + strmov(mysql->net.last_error, ER(mysql->net.last_errno)); DBUG_RETURN(1); } mysql_init(&tmp_mysql); |