database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Update mysql_upgrade tests for 5.1

Browse Source 
Add "two liner" to mysqld --bootstrap that allows
wo write scripts that can be run both by mysql and mysqld --bootstrap
Remove duplicate create of MySQL system tables 


mysql-test/r/mysql_upgrade.result:
  Update mysql_upgrade.result for new tables in 5.1
scripts/mysql_system_tables.sql:
  Use "delimiter ;;" to make it possible to run the script
  both with "mysql" and "mysqld --bootstrap"
scripts/mysql_system_tables_fix.sql:
  Remove duplicate stored procedure for creating slow_log
  and general_log.
  Remove duplicate CREATE of ndb_binlog_index.
  Those are already defined in mysql_system_tables.sql
sql/sql_parse.cc:
  Make "mysqld --bootstrap skip lines startig with "delimiter"
  thus making it possible to write sql scripts containing
  stored procedures that can be executed both  with "mysql" and
  "mysqld --bootstrap"
This commit is contained in:
unknown
2007-04-18 16:23:19 +02:00
parent 6bfa5a40bc
commit 07ec45cc55
4 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mysql-test/r/mysql_upgrade.result
View File

@@ -1,14 +1,20 @@
Run mysql_upgrade once
mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
mysql.general_log OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
mysql.help_topic OK
mysql.host OK
mysql.ndb_binlog_index OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.servers OK
mysql.slow_log OK
mysql.tables_priv OK
mysql.time_zone OK
mysql.time_zone_leap_second OK
@@ -21,14 +27,20 @@ This installation of MySQL is already upgraded to VERSION, use --force if you st
Force should run it regardless of wether it's been run before
mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
mysql.general_log OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
mysql.help_topic OK
mysql.host OK
mysql.ndb_binlog_index OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.servers OK
mysql.slow_log OK
mysql.tables_priv OK
mysql.time_zone OK
mysql.time_zone_leap_second OK
@@ -41,14 +53,20 @@ GRANT ALL ON *.* TO mysqltest1@'%';
Run mysql_upgrade with password protected account
mysql.columns_priv OK
mysql.db OK
mysql.event OK
mysql.func OK
mysql.general_log OK
mysql.help_category OK
mysql.help_keyword OK
mysql.help_relation OK
mysql.help_topic OK
mysql.host OK
mysql.ndb_binlog_index OK
mysql.plugin OK
mysql.proc OK
mysql.procs_priv OK
mysql.servers OK
mysql.slow_log OK
mysql.tables_priv OK
mysql.time_zone OK
mysql.time_zone_leap_second OK