diff options
| author | unknown <serg@serg.mylan> | 2004-07-20 15:34:57 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-07-20 15:34:57 +0200 |
| commit | e2d25910f8d5a5edacf3b64ad24f7e9dcd06123f (patch) | |
| tree | 25cbffcf973dd7f352a4bcdc885aa172cb20a57a /scripts/mysql_fix_privilege_tables.sh | |
| parent | 3f5e1ba9ea87087836dcf311a174f4aae3d4cb5b (diff) | |
| parent | 26821ee3f584a79cfaf4339c0b5c45307be21986 (diff) | |
| download | mariadb-git-e2d25910f8d5a5edacf3b64ad24f7e9dcd06123f.tar.gz | |
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
Diffstat (limited to 'scripts/mysql_fix_privilege_tables.sh')
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sh b/scripts/mysql_fix_privilege_tables.sh index 6a0618fc1b5..89b96f2bc6e 100644 --- a/scripts/mysql_fix_privilege_tables.sh +++ b/scripts/mysql_fix_privilege_tables.sh @@ -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 "" |