mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
manual merge
client/mysql.cc: Auto merged client/mysqlbinlog.cc: Auto merged include/my_global.h: Auto merged innobase/include/row0mysql.h: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/system_mysql_db.result: Auto merged mysql-test/t/subselect.test: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/item_subselect.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
@@ -149,11 +149,11 @@ s_echo()
|
||||
fi
|
||||
}
|
||||
|
||||
s_echo "This scripts updates all the mysql privilege tables to be usable by"
|
||||
s_echo "This script updates all the mysql privilege tables to be usable by"
|
||||
s_echo "MySQL 4.0 and above."
|
||||
s_echo ""
|
||||
s_echo "This is needed if you want to use the new GRANT functions,"
|
||||
s_echo "CREATE AGGREGATE FUNCTION, use stored procedures or want to use the"
|
||||
s_echo "CREATE AGGREGATE FUNCTION, stored procedures, or"
|
||||
s_echo "more secure passwords in 4.1"
|
||||
s_echo ""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user