diff options
author | Magnus Svensson <msvensson@mysql.com> | 2009-01-26 15:20:33 +0100 |
---|---|---|
committer | Magnus Svensson <msvensson@mysql.com> | 2009-01-26 15:20:33 +0100 |
commit | ee156bf0c58a973df1ea05bdb6ad0748d31c43b4 (patch) | |
tree | 4a738571fdc0549c35d3c9896f4173142d37e49f /mysql-test/r/mysql_upgrade.result | |
parent | 3bec589becf6c7bbf2ee62b333d10fe0a6d91b0d (diff) | |
download | mariadb-git-ee156bf0c58a973df1ea05bdb6ad0748d31c43b4.tar.gz |
WL#4189 mtr.pl v2
- rewrite "check warnings" to be faster by not creating a full join
between error_log and suspicious_patterns while running REGEXP.
Instead add a column to error_log that will be set to 1 to indicate
a warning and run the 6 REGEXP's we have for suspicious lines as
6 separate full table scans.
- Remove the "suspicious_patterns" table from mtr db
- Use 'xykls37' as separator when loading the error log, that line should
hopefully never exist in a line that should be a warning
Diffstat (limited to 'mysql-test/r/mysql_upgrade.result')
-rw-r--r-- | mysql-test/r/mysql_upgrade.result | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mysql-test/r/mysql_upgrade.result b/mysql-test/r/mysql_upgrade.result index be14e282f2a..384442f8c31 100644 --- a/mysql-test/r/mysql_upgrade.result +++ b/mysql-test/r/mysql_upgrade.result @@ -1,6 +1,5 @@ Run mysql_upgrade once mtr.global_suppressions OK -mtr.suspicious_patterns OK mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK @@ -33,7 +32,6 @@ Run it again - should say already completed This installation of MySQL is already upgraded to VERSION, use --force if you still need to run mysql_upgrade Force should run it regardless of wether it's been run before mtr.global_suppressions OK -mtr.suspicious_patterns OK mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK @@ -66,7 +64,6 @@ CREATE USER mysqltest1@'%' IDENTIFIED by 'sakila'; GRANT ALL ON *.* TO mysqltest1@'%'; Run mysql_upgrade with password protected account mtr.global_suppressions OK -mtr.suspicious_patterns OK mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK @@ -101,7 +98,6 @@ mysqlcheck: Got error: 2005: Unknown MySQL server host 'not_existing_host' (errn FATAL ERROR: Upgrade failed set GLOBAL sql_mode='STRICT_ALL_TABLES,ANSI_QUOTES,NO_ZERO_DATE'; mtr.global_suppressions OK -mtr.suspicious_patterns OK mtr.test_suppressions OK mysql.columns_priv OK mysql.db OK |