mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
Merge with 4.0.13
This commit is contained in:
@@ -1,14 +1,5 @@
|
||||
#!/bin/sh
|
||||
|
||||
echo "This scripts updates the mysql.user, mysql.db, mysql.host and the"
|
||||
echo "mysql.func tables to MySQL 3.22.14 and above."
|
||||
echo ""
|
||||
echo "This is needed if you want to use the new GRANT functions,"
|
||||
echo "CREATE AGGREGATE FUNCTION or want to use the more secure passwords in 3.23"
|
||||
echo ""
|
||||
echo "If you get 'Access denied' errors, you should run this script again"
|
||||
echo "and give the MySQL root user password as an argument!"
|
||||
|
||||
root_password="$1"
|
||||
host="localhost"
|
||||
user="root"
|
||||
@@ -20,6 +11,21 @@ else
|
||||
cmd="@bindir@/mysql -f --user=$user --password=$root_password --host=$host mysql"
|
||||
fi
|
||||
|
||||
# Debian addition
|
||||
if [ "$1" = "--sql-only" ]; then
|
||||
root_password=""
|
||||
cmd="/usr/share/mysql/echo_stderr"
|
||||
fi
|
||||
|
||||
echo "This scripts updates the mysql.user, mysql.db, mysql.host and the"
|
||||
echo "mysql.func tables to MySQL 3.22.14 and above."
|
||||
echo ""
|
||||
echo "This is needed if you want to use the new GRANT functions,"
|
||||
echo "CREATE AGGREGATE FUNCTION or want to use the more secure passwords in 3.23"
|
||||
echo ""
|
||||
echo "If you get 'Access denied' errors, you should run this script again"
|
||||
echo "and give the MySQL root user password as an argument!"
|
||||
|
||||
echo "Converting all privilege tables to MyISAM format"
|
||||
$cmd <<END_OF_DATA
|
||||
ALTER TABLE user type=MyISAM;
|
||||
|
Reference in New Issue
Block a user