diff options
| author | unknown <monty@tik.mysql.com> | 2000-10-11 00:54:01 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.com> | 2000-10-11 00:54:01 +0300 |
| commit | 314a0b9c7ada0729d0f9f18c9ca4ef3a1ca757e1 (patch) | |
| tree | d37cbc7af2c4122741874109bddb03c8ae220b71 /sql/sql_table.cc | |
| parent | da5366886f2c852cb05f8b9b31848d13a4816cad (diff) | |
| parent | f4d7717ceaabc8948c4517dab603f1103222a176 (diff) | |
| download | mariadb-git-314a0b9c7ada0729d0f9f18c9ca4ef3a1ca757e1.tar.gz | |
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
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 390bfb28fd4..4ddd60a546b 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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())) |