diff options
author | Michael Widenius <monty@askmonty.org> | 2014-01-22 15:16:57 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2014-01-22 15:16:57 +0200 |
commit | 04bee0af2e8d663fd06e5dc4ecdc2b64b30440ea (patch) | |
tree | 5fe06b88ed779592ae59b33690cae7223a4ef22f /scripts | |
parent | 5e02635eb846214b462ed4ab45b2142a08dc5a91 (diff) | |
download | mariadb-git-04bee0af2e8d663fd06e5dc4ecdc2b64b30440ea.tar.gz |
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
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/CMakeLists.txt | 8 | ||||
-rw-r--r-- | scripts/mysql_install_db.sh | 8 | ||||
-rw-r--r--[-rwxr-xr-x] | scripts/mysql_secure_installation.pl.in | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | scripts/mytop.sh | 0 |
4 files changed, 12 insertions, 4 deletions
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 76e92899c2a..cd4cfc858d8 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -172,6 +172,10 @@ ENDIF() CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysqlbug.sh ${CMAKE_CURRENT_BINARY_DIR}/mysqlbug ESCAPE_QUOTES @ONLY) + EXECUTE_PROCESS( + COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mysqlbug + ) + INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/mysqlbug DESTINATION ${INSTALL_BINDIR} COMPONENT Server @@ -205,6 +209,10 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) SET(DEST ${INSTALL_SCRIPTDIR}) SET(EXT) + EXECUTE_PROCESS( + COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db + ) + INSTALL_SCRIPT( "${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db" DESTINATION ${DEST} diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index a481aa836c6..10038d2cf58 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -90,7 +90,7 @@ link_to_help() { echo echo "The latest information about mysql_install_db is available at" - echo "http://kb.askmonty.org/v/installing-system-tables-mysql_install_db." + echo "https://mariadb.com/kb/en/installing-system-tables-mysql_install_db" } parse_arg() @@ -492,7 +492,7 @@ then echo "databases and anonymous user created by default. This is" echo "strongly recommended for production servers." echo - echo "See the MariaDB Knowledgebase at http://kb.askmonty.org or the" + echo "See the MariaDB Knowledgebase at http://mariadb.com/kb or the" echo "MySQL manual for more instructions." if test "$in_rpm" -eq 0 @@ -512,9 +512,9 @@ then echo "You can find additional information about the MySQL part at:" echo "http://dev.mysql.com" echo "Support MariaDB development by buying support/new features from" - echo "Monty Program Ab. You can contact us about this at sales@montyprogram.com". + echo "SkySQL Ab. You can contact us about this at sales@skysql.com". echo "Alternatively consider joining our community based development effort:" - echo "http://kb.askmonty.org/en/contributing-to-the-mariadb-project/" + echo "http://mariadb.com/kb/en/contributing-to-the-mariadb-project/" echo fi diff --git a/scripts/mysql_secure_installation.pl.in b/scripts/mysql_secure_installation.pl.in index 188a6bd7104..188a6bd7104 100755..100644 --- a/scripts/mysql_secure_installation.pl.in +++ b/scripts/mysql_secure_installation.pl.in diff --git a/scripts/mytop.sh b/scripts/mytop.sh index 480805e90b1..480805e90b1 100755..100644 --- a/scripts/mytop.sh +++ b/scripts/mytop.sh |