mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
daac922bc3
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c: Auto merged Makefile.am: Auto merged acinclude.m4: Auto merged BitKeeper/triggers/post-commit: Auto merged Build-tools/Do-compile: Auto merged VC++Files/libmysql/libmysql.dsp: Auto merged VC++Files/mysql.dsw: Auto merged client/mysql.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqldump.c: Auto merged include/config-win.h: Auto merged include/my_base.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/violite.h: Auto merged innobase/buf/buf0flu.c: Auto merged innobase/buf/buf0lru.c: Auto merged innobase/include/buf0buf.h: Auto merged innobase/include/buf0lru.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/ut/ut0ut.c: Auto merged myisam/ft_boolean_search.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_key.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_range.c: Auto merged myisam/mi_search.c: Auto merged myisam/sort.c: Auto merged mysql-test/r/delete.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/innodb_handler.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/r/join_outer.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/multi_update.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/ctype_latin1_de.test: Auto merged mysql-test/t/delete.test: Auto merged mysql-test/t/fulltext.test: Auto merged mysql-test/t/innodb_handler.test: Auto merged mysql-test/t/join.test: Auto merged mysql-test/t/join_outer.test: Auto merged mysql-test/t/key.test: Auto merged mysql-test/t/multi_update.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/repair.test: Auto merged mysql-test/t/select_safe.test: Auto merged mysql-test/t/type_decimal.test: Auto merged mysql-test/t/variables.test: Auto merged mysys/default.c: Auto merged mysys/my_pthread.c: Auto merged scripts/mysql_fix_privilege_tables.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/ha_heap.h: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/init.cc: Auto merged sql/item.cc: Auto merged sql/item_create.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/mini_client.cc: Auto merged sql/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/records.cc: Auto merged sql/slave.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_analyse.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/share/dutch/errmsg.txt: Auto merged sql/share/english/errmsg.txt: Auto merged sql/share/estonian/errmsg.txt: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/errmsg.txt: Auto merged sql/share/japanese/errmsg.txt: Auto merged sql/share/korean/errmsg.txt: Auto merged sql/share/norwegian-ny/errmsg.txt: Auto merged sql/share/norwegian/errmsg.txt: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/russian/errmsg.txt: Auto merged sql/share/slovak/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged sql/share/ukrainian/errmsg.txt: Auto merged sql/unireg.h: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/test-transactions.sh: Auto merged strings/ctype-tis620.c: Auto merged tests/grant.res: Auto merged sql/log_event.cc: Merge with 4.0.13 Cleaned up comment syntax
212 lines
7 KiB
Bash
212 lines
7 KiB
Bash
#!/bin/sh
|
|
|
|
root_password="$1"
|
|
host="localhost"
|
|
user="root"
|
|
|
|
if test -z $1 ; then
|
|
cmd="@bindir@/mysql -f --user=$user --host=$host mysql"
|
|
else
|
|
root_password="$1"
|
|
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;
|
|
ALTER TABLE db type=MyISAM;
|
|
ALTER TABLE host type=MyISAM;
|
|
ALTER TABLE func type=MyISAM;
|
|
ALTER TABLE columns_priv type=MyISAM;
|
|
ALTER TABLE tables_priv type=MyISAM;
|
|
END_OF_DATA
|
|
|
|
|
|
# Fix old password format, add File_priv and func table
|
|
echo ""
|
|
echo "If your tables are already up to date or partially up to date you will"
|
|
echo "get some warnings about 'Duplicated column name'. You can safely ignore these!"
|
|
|
|
$cmd <<END_OF_DATA
|
|
alter table user change password password char(16) NOT NULL;
|
|
alter table user add File_priv enum('N','Y') NOT NULL;
|
|
CREATE TABLE if not exists func (
|
|
name char(64) DEFAULT '' NOT NULL,
|
|
ret tinyint(1) DEFAULT '0' NOT NULL,
|
|
dl char(128) DEFAULT '' NOT NULL,
|
|
type enum ('function','aggregate') NOT NULL,
|
|
PRIMARY KEY (name)
|
|
);
|
|
END_OF_DATA
|
|
echo ""
|
|
|
|
# Add the new grant colums
|
|
|
|
echo "Creating Grant Alter and Index privileges if they don't exists"
|
|
echo "You can ignore any Duplicate column errors"
|
|
$cmd <<END_OF_DATA
|
|
alter table user add Grant_priv enum('N','Y') NOT NULL,add References_priv enum('N','Y') NOT NULL,add Index_priv enum('N','Y') NOT NULL,add Alter_priv enum('N','Y') NOT NULL;
|
|
alter table host add Grant_priv enum('N','Y') NOT NULL,add References_priv enum('N','Y') NOT NULL,add Index_priv enum('N','Y') NOT NULL,add Alter_priv enum('N','Y') NOT NULL;
|
|
alter table db add Grant_priv enum('N','Y') NOT NULL,add References_priv enum('N','Y') NOT NULL,add Index_priv enum('N','Y') NOT NULL,add Alter_priv enum('N','Y') NOT NULL;
|
|
END_OF_DATA
|
|
res=$?
|
|
echo ""
|
|
|
|
# If the new grant columns didn't exists, copy File -> Grant
|
|
# and Create -> Alter, Index, References
|
|
|
|
if test $res = 0
|
|
then
|
|
echo "Setting default privileges for the new grant, index and alter privileges"
|
|
$cmd <<END_OF_DATA
|
|
UPDATE user SET Grant_priv=File_priv,References_priv=Create_priv,Index_priv=Create_priv,Alter_priv=Create_priv;
|
|
UPDATE db SET References_priv=Create_priv,Index_priv=Create_priv,Alter_priv=Create_priv;
|
|
UPDATE host SET References_priv=Create_priv,Index_priv=Create_priv,Alter_priv=Create_priv;
|
|
END_OF_DATA
|
|
echo ""
|
|
fi
|
|
|
|
#
|
|
# The second alter changes ssl_type to new 4.0.2 format
|
|
|
|
echo "Adding columns needed by GRANT .. REQUIRE (openssl)"
|
|
echo "You can ignore any Duplicate column errors"
|
|
$cmd <<END_OF_DATA
|
|
ALTER TABLE user
|
|
ADD ssl_type enum('','ANY','X509', 'SPECIFIED') NOT NULL,
|
|
ADD ssl_cipher BLOB NOT NULL,
|
|
ADD x509_issuer BLOB NOT NULL,
|
|
ADD x509_subject BLOB NOT NULL;
|
|
ALTER TABLE user MODIFY ssl_type enum('','ANY','X509', 'SPECIFIED') NOT NULL;
|
|
END_OF_DATA
|
|
echo ""
|
|
|
|
#
|
|
# Create tables_priv and columns_priv if they don't exists
|
|
#
|
|
|
|
echo "Creating the new table and column privilege tables"
|
|
|
|
$cmd <<END_OF_DATA
|
|
CREATE TABLE IF NOT EXISTS tables_priv (
|
|
Host char(60) DEFAULT '' NOT NULL,
|
|
Db char(60) DEFAULT '' NOT NULL,
|
|
User char(16) DEFAULT '' NOT NULL,
|
|
Table_name char(60) DEFAULT '' NOT NULL,
|
|
Grantor char(77) DEFAULT '' NOT NULL,
|
|
Timestamp timestamp(14),
|
|
Table_priv set('Select','Insert','Update','Delete','Create','Drop','Grant','References','Index','Alter') DEFAULT '' NOT NULL,
|
|
Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL,
|
|
PRIMARY KEY (Host,Db,User,Table_name)
|
|
);
|
|
CREATE TABLE IF NOT EXISTS columns_priv (
|
|
Host char(60) DEFAULT '' NOT NULL,
|
|
Db char(60) DEFAULT '' NOT NULL,
|
|
User char(16) DEFAULT '' NOT NULL,
|
|
Table_name char(60) DEFAULT '' NOT NULL,
|
|
Column_name char(59) DEFAULT '' NOT NULL,
|
|
Timestamp timestamp(14),
|
|
Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL,
|
|
PRIMARY KEY (Host,Db,User,Table_name,Column_name)
|
|
);
|
|
END_OF_DATA
|
|
|
|
#
|
|
# Name change of Type -> Column_priv from MySQL 3.22.12
|
|
#
|
|
|
|
echo "Changing name of columns_priv.Type -> columns_priv.Column_priv"
|
|
echo "You can ignore any Unknown column errors from this"
|
|
|
|
$cmd <<END_OF_DATA
|
|
ALTER TABLE columns_priv change Type Column_priv set('Select','Insert','Update','References') DEFAULT '' NOT NULL;
|
|
END_OF_DATA
|
|
echo ""
|
|
|
|
#
|
|
# Add the new 'type' column to the func table.
|
|
#
|
|
|
|
echo "Fixing the func table"
|
|
echo "You can ignore any Duplicate column errors"
|
|
|
|
$cmd <<EOF
|
|
alter table func add type enum ('function','aggregate') NOT NULL;
|
|
EOF
|
|
echo ""
|
|
|
|
#
|
|
# Change the user,db and host tables to MySQL 4.0 format
|
|
#
|
|
|
|
echo "Adding new fields used by MySQL 4.0.2 to the privilege tables"
|
|
echo "You can ignore any Duplicate column errors"
|
|
|
|
$cmd <<END_OF_DATA
|
|
alter table user
|
|
add Show_db_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER alter_priv,
|
|
add Super_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Show_db_priv,
|
|
add Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Super_priv,
|
|
add Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Create_tmp_table_priv,
|
|
add Execute_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Lock_tables_priv,
|
|
add Repl_slave_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Execute_priv,
|
|
add Repl_client_priv enum('N','Y') DEFAULT 'N' NOT NULL AFTER Repl_slave_priv;
|
|
END_OF_DATA
|
|
|
|
if test $? -eq "0"
|
|
then
|
|
# Convert privileges so that users have similar privileges as before
|
|
echo ""
|
|
echo "Updating new privileges in MySQL 4.0.2 from old ones"
|
|
$cmd <<END_OF_DATA
|
|
update user set show_db_priv= select_priv, super_priv=process_priv, execute_priv=process_priv, create_tmp_table_priv='Y', Lock_tables_priv='Y', Repl_slave_priv=file_priv, Repl_client_priv=file_priv where user<>"";
|
|
END_OF_DATA
|
|
echo ""
|
|
fi
|
|
|
|
# Add fields that can be used to limit number of questions and connections
|
|
# for some users.
|
|
|
|
$cmd <<END_OF_DATA
|
|
alter table user
|
|
add max_questions int(11) NOT NULL AFTER x509_subject,
|
|
add max_updates int(11) unsigned NOT NULL AFTER max_questions,
|
|
add max_connections int(11) unsigned NOT NULL AFTER max_updates;
|
|
END_OF_DATA
|
|
|
|
# Increase password length to handle new passwords
|
|
|
|
@bindir@/mysql -f --user=root --password="$root_password" --host="$host" mysql <<END_OF_DATA
|
|
alter table user
|
|
change password password char(45) not null;
|
|
END_OF_DATA
|
|
|
|
|
|
|
|
#
|
|
# Add Create_tmp_table_priv and Lock_tables_priv to db and host
|
|
#
|
|
|
|
$cmd <<END_OF_DATA
|
|
alter table db
|
|
add Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,
|
|
add Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
|
|
alter table host
|
|
add Create_tmp_table_priv enum('N','Y') DEFAULT 'N' NOT NULL,
|
|
add Lock_tables_priv enum('N','Y') DEFAULT 'N' NOT NULL;
|
|
END_OF_DATA
|