Commit 6f59c41d authored by Michael Widenius's avatar Michael Widenius

Updated failure text for maria_install_db

Don't give warning about block_insert if table is crashed.

scripts/mysql_install_db.sh:
  Added link to KB.
storage/maria/ma_recovery.c:
  Don't give warning about block_insert if table is crashed.
parent f7a701ae
...@@ -408,20 +408,16 @@ else ...@@ -408,20 +408,16 @@ else
echo " shell> $bindir/mysql -u root mysql" echo " shell> $bindir/mysql -u root mysql"
echo " mysql> show tables" echo " mysql> show tables"
echo echo
echo "Try 'mysqld --help' if you have problems with paths. Using --log" echo "Try 'mysqld --help' if you have problems with paths. Using"
echo "gives you a log in $ldata that may be helpful." echo "--general-log gives you a log in $ldata that may be helpful."
echo echo
echo "The latest information about MariaDB is available on the web at" echo "The latest information about mysql_install_db is available at"
echo "http://askmonty.org/wiki/index.php/MariaDB". echo "http://kb.askmonty.org/v/installing-system-tables-mysql_install_db."
echo "If you have a problem, you can consult the MySQL manual section"
echo "'Problems running mysql_install_db', and the manual section that"
echo "describes problems on your OS at http://dev.mysql.com/doc/"
echo "MariaDB is hosted on launchpad; You can find the latest source and" echo "MariaDB is hosted on launchpad; You can find the latest source and"
echo "email lists at http://launchpad.net/maria" echo "email lists at http://launchpad.net/maria"
echo echo
echo "Please check all of the above before mailing us! And remember, if" echo "Please check all of the above before mailing us! And remember, if"
echo "you do mail us, you should use the $scriptdir/mysqlbug script!" echo "you do mail us, you should use the $scriptdir/mysqlbug script!"
echo
exit 1 exit 1
fi fi
......
...@@ -638,6 +638,10 @@ prototype_redo_exec_hook(INCOMPLETE_LOG) ...@@ -638,6 +638,10 @@ prototype_redo_exec_hook(INCOMPLETE_LOG)
/* no such table, don't need to warn */ /* no such table, don't need to warn */
return 0; return 0;
} }
if (maria_is_crashed(info))
return 0;
if (info->s->state.is_of_horizon > rec->lsn) if (info->s->state.is_of_horizon > rec->lsn)
{ {
/* /*
...@@ -673,7 +677,7 @@ prototype_redo_exec_hook(INCOMPLETE_LOG) ...@@ -673,7 +677,7 @@ prototype_redo_exec_hook(INCOMPLETE_LOG)
"about insertion of data by ALTER TABLE and CREATE SELECT, " "about insertion of data by ALTER TABLE and CREATE SELECT, "
"as they are not necessary for recovery; " "as they are not necessary for recovery; "
"present applying of log records to table '%s' may well not work." "present applying of log records to table '%s' may well not work."
"***\n", info->s->index_file_name.str); "***", info->s->index_file_name.str);
/* Prevent using the table for anything else than undo repair */ /* Prevent using the table for anything else than undo repair */
_ma_mark_file_crashed(info->s); _ma_mark_file_crashed(info->s);
......
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