From 04bee0af2e8d663fd06e5dc4ecdc2b64b30440ea Mon Sep 17 00:00:00 2001
From: Michael Widenius <monty@askmonty.org>
Date: Wed, 22 Jan 2014 15:16:57 +0200
Subject: Fix for MDEV-5547: Bad error message when moving very old .frm files
 to MariaDB 5.5. mysql_upgrade --help now also prints out --default options
 and variable values. mysql_upgrade now prints permission errors.
 mysql_upgrade doesn't print some non essential info if --silent is used.
 Added handler error message about incompatible versions Fixed that mysqlbug
 and mysql_install_db have the executable flag set. Removed executable flag
 for some non executable files. Changed in mysql_install_db askmonty.org to
 mariadb.com. Ensured that all client executables prints --default options the
 same way. Allow REPAIR ... USE_FRM for old .frm files if the are still
 compatible. Extended shown error for storage engine messages.

client/mysql.cc:
  print_defaults() should be first (as in all other programs)
client/mysql_upgrade.c:
  --help now also prints out --default options and variable values
  Print out error if wrong permissions
  Don't print info if --silent
client/mysqladmin.cc:
  print_defaults() should be first (as in all other programs)
client/mysqlbinlog.cc:
  Added print_defaults() to --help
client/mysqlcheck.c:
  Added empty line in --help
client/mysqlimport.c:
  Added empty line in --help
client/mysqlshow.c:
  Made --help compatible
client/mysqlslap.c:
  Made --help compatible
client/mysqltest.cc:
  Added print_defaults() to --help
include/handler_ername.h:
  Added handler error message
include/my_base.h:
  Added handler error message
mysql-test/r/mysql_upgrade.result:
  Updated results
mysql-test/r/repair.result:
  Added test case for better error messages
mysql-test/std_data/host_old.MYD:
  Added test case for better error messages
mysql-test/std_data/host_old.MYI:
  Added test case for better error messages
mysql-test/std_data/host_old.frm:
  Added test case for better error messages
mysql-test/t/repair.test:
  Added test case for better error messages
mysys/my_handler_errors.h:
  Added handler error message
scripts/CMakeLists.txt:
  Fixed that mysqlbug and mysql_install_db have the executable flag set
scripts/mysql_install_db.sh:
  askmonty.org -> mariadb.com
sql/ha_partition.cc:
  Sometimes table_type() can be called for errors even if partition didn't manage to open any files
sql/handler.cc:
  Write clear text for not handled, but defined error messages.
sql/share/errmsg-utf8.txt:
  Extended shown error for storage engine messages
sql/sql_admin.cc:
  Allow REPAIR ... USE_FRM for old .frm files if the are still compatible
storage/myisam/ha_myisam.cc:
  Use new error message
---
 mysql-test/t/mysql_upgrade.test |  5 +++++
 mysql-test/t/repair.test        | 20 ++++++++++++++++++++
 2 files changed, 25 insertions(+)

(limited to 'mysql-test/t')

diff --git a/mysql-test/t/mysql_upgrade.test b/mysql-test/t/mysql_upgrade.test
index 3bdaf4ceadb..820144216ab 100644
--- a/mysql-test/t/mysql_upgrade.test
+++ b/mysql-test/t/mysql_upgrade.test
@@ -40,6 +40,11 @@ GRANT ALL ON *.* TO mysqltest1@'%';
 
 DROP USER mysqltest1@'%';
 
+#
+# check that we get proper error messages if wrong user
+
+--error 1
+--exec $MYSQL_UPGRADE --force --user=mysqltest1 --password=sakila 2>&1
 
 #
 # Bug #26639 mysql_upgrade exits successfully even if external command failed
diff --git a/mysql-test/t/repair.test b/mysql-test/t/repair.test
index 3c55f06ff4c..337b73f37d1 100644
--- a/mysql-test/t/repair.test
+++ b/mysql-test/t/repair.test
@@ -188,3 +188,23 @@ set @@autocommit= 0;
 repair table t1, t2;
 set @@autocommit= default;
 drop tables t1, t2;
+
+--echo #
+--echo # Check that we have decent error messages when using crashed
+--echo # .frm file from MySQL 3.23
+--echo #
+
+--echo # Test with a saved table from 3.23
+let $MYSQLD_DATADIR= `select @@datadir`;
+--copy_file std_data/host_old.frm $MYSQLD_DATADIR/test/t1.frm
+--copy_file std_data/host_old.MYD $MYSQLD_DATADIR/test/t1.MYD
+--copy_file std_data/host_old.MYI $MYSQLD_DATADIR/test/t1.MYI
+
+--error ER_GET_ERRMSG
+select count(*) from t1;
+check table t1;
+repair table t1;
+repair table t1 use_frm;
+select count(*) from t1;
+check table t1;
+drop table t1;
-- 
cgit v1.2.1