1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge with 3.23 to get bug fix for SHOW PROCESSLIST + running thread

myisam/mi_create.c:
  Auto merged
sql/log.cc:
  Auto merged
innobase/btr/btr0sea.c:
  Merge with 3.23 (use local file)
sql/slave.cc:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23
sql/sql_parse.cc:
  Merge with 3.23
This commit is contained in:
unknown
2003-01-19 01:31:43 +02:00
3 changed files with 27 additions and 12 deletions

View File

@ -852,7 +852,7 @@ int mysql_table_dump(THD* thd, char* db, char* tbl_name, int fd)
goto err;
}
net_flush(&thd->net);
if ((error = table->file->dump(thd,fd)))
if ((error= table->file->dump(thd,fd)))
my_error(ER_GET_ERRNO, MYF(0));
err:
@ -958,7 +958,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
tbl_name[tbl_len] = 0;
if (mysql_table_dump(thd, db, tbl_name, -1))
send_error(&thd->net); // dump to NET
break;
}
case COM_CHANGE_USER: