Commit e06a1704 authored by marko's avatar marko

row_create_table_for_mysql(), row_truncate_table_for_mysql(),

row_drop_table_for_mysql(): Do not mention innodb_force_recovery
when newraw is set.
parent bcd46059
...@@ -1757,13 +1757,11 @@ row_create_table_for_mysql( ...@@ -1757,13 +1757,11 @@ row_create_table_for_mysql(
ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH); ut_ad(trx->dict_operation_lock_mode == RW_X_LATCH);
if (srv_created_new_raw) { if (srv_created_new_raw) {
fputs("InnoDB: A new raw disk partition was initialized or\n" fputs("InnoDB: A new raw disk partition was initialized:\n"
"InnoDB: innodb_force_recovery is on: we do not allow\n" "InnoDB: we do not allow database modifications"
"InnoDB: database modifications by the user. Shut down\n" " by the user.\n"
"InnoDB: mysqld and edit my.cnf so that newraw" "InnoDB: Shut down mysqld and edit my.cnf so that newraw"
" is replaced\n" " is replaced with raw.\n", stderr);
"InnoDB: with raw, and innodb_force_... is removed.\n",
stderr);
dict_mem_table_free(table); dict_mem_table_free(table);
trx_commit_for_mysql(trx); trx_commit_for_mysql(trx);
...@@ -2704,13 +2702,11 @@ row_truncate_table_for_mysql( ...@@ -2704,13 +2702,11 @@ row_truncate_table_for_mysql(
ut_ad(table); ut_ad(table);
if (srv_created_new_raw) { if (srv_created_new_raw) {
fputs("InnoDB: A new raw disk partition was initialized or\n" fputs("InnoDB: A new raw disk partition was initialized:\n"
"InnoDB: innodb_force_recovery is on: we do not allow\n" "InnoDB: we do not allow database modifications"
"InnoDB: database modifications by the user. Shut down\n" " by the user.\n"
"InnoDB: mysqld and edit my.cnf so that newraw" "InnoDB: Shut down mysqld and edit my.cnf so that newraw"
" is replaced\n" " is replaced with raw.\n", stderr);
"InnoDB: with raw, and innodb_force_... is removed.\n",
stderr);
return(DB_ERROR); return(DB_ERROR);
} }
...@@ -2944,13 +2940,11 @@ row_drop_table_for_mysql( ...@@ -2944,13 +2940,11 @@ row_drop_table_for_mysql(
ut_a(name != NULL); ut_a(name != NULL);
if (srv_created_new_raw) { if (srv_created_new_raw) {
fputs("InnoDB: A new raw disk partition was initialized or\n" fputs("InnoDB: A new raw disk partition was initialized:\n"
"InnoDB: innodb_force_recovery is on: we do not allow\n" "InnoDB: we do not allow database modifications"
"InnoDB: database modifications by the user. Shut down\n" " by the user.\n"
"InnoDB: mysqld and edit my.cnf so that newraw" "InnoDB: Shut down mysqld and edit my.cnf so that newraw"
" is replaced\n" " is replaced with raw.\n", stderr);
"InnoDB: with raw, and innodb_force_... is removed.\n",
stderr);
return(DB_ERROR); return(DB_ERROR);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment