[Commits] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2927)

Michael Widenius monty at askmonty.org
Thu Sep 9 18:12:08 EEST 2010


#At lp:maria based on revid:monty at askmonty.org-20100908231255-mmwjymzhffkufzze

 2927 Michael Widenius	2010-09-09
      Updated failure text for maria_install_db
      Don't give warning about block_insert if table is crashed.
      modified:
        scripts/mysql_install_db.sh
        storage/maria/ma_recovery.c

per-file messages:
  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.
=== modified file 'scripts/mysql_install_db.sh'
--- a/scripts/mysql_install_db.sh	2010-08-04 18:36:11 +0000
+++ b/scripts/mysql_install_db.sh	2010-09-09 15:12:06 +0000
@@ -408,20 +408,16 @@ else
   echo "    shell> $bindir/mysql -u root mysql"
   echo "    mysql> show tables"
   echo
-  echo "Try 'mysqld --help' if you have problems with paths.  Using --log"
-  echo "gives you a log in $ldata that may be helpful."
+  echo "Try 'mysqld --help' if you have problems with paths.  Using"
+  echo "--general-log gives you a log in $ldata that may be helpful."
   echo
-  echo "The latest information about MariaDB is available on the web at"
-  echo "http://askmonty.org/wiki/index.php/MariaDB".
-  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 "The latest information about mysql_install_db is available at"
+  echo "http://kb.askmonty.org/v/installing-system-tables-mysql_install_db."
   echo "MariaDB is hosted on launchpad; You can find the latest source and"
   echo "email lists at http://launchpad.net/maria"
   echo
   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
   exit 1
 fi
 

=== modified file 'storage/maria/ma_recovery.c'
--- a/storage/maria/ma_recovery.c	2010-09-08 23:12:55 +0000
+++ b/storage/maria/ma_recovery.c	2010-09-09 15:12:06 +0000
@@ -638,6 +638,10 @@ prototype_redo_exec_hook(INCOMPLETE_LOG)
     /* no such table, don't need to warn */
     return 0;
   }
+
+  if (maria_is_crashed(info))
+    return 0;
+
   if (info->s->state.is_of_horizon > rec->lsn)
   {
     /*
@@ -673,7 +677,7 @@ prototype_redo_exec_hook(INCOMPLETE_LOG)
           "about insertion of data by ALTER TABLE and CREATE SELECT, "
           "as they are not necessary for recovery; "
           "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 */
   _ma_mark_file_crashed(info->s);



More information about the commits mailing list