1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Merge narttu:/my/mysql into tik.mysql.com:/home/my/mysql

Docs/manual.texi:
  Auto merged
BitKeeper/etc/logging_ok:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2000-10-11 00:54:01 +03:00
8 changed files with 37 additions and 22 deletions

View File

@@ -867,10 +867,12 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
}
if ((table->table->db_stat & HA_READ_ONLY) && open_for_modify)
{
char buff[FN_REFLEN + MYSQL_ERRMSG_SIZE];
net_store_data(packet, table_name);
net_store_data(packet, operator_name);
net_store_data(packet, "error");
net_store_data(packet, ER(ER_OPEN_AS_READONLY));
sprintf(buff, ER(ER_OPEN_AS_READONLY), table_name);
net_store_data(packet, buff);
close_thread_tables(thd);
if (my_net_write(&thd->net, (char*) thd->packet.ptr(),
packet->length()))