diff options
| author | unknown <andrey@lmy004.> | 2006-01-11 12:49:56 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-01-11 12:49:56 +0100 |
| commit | b8ce8ad1d5168371bde4c4d3de2a22d3c725a57f (patch) | |
| tree | 3b6efcf2fc9c9f1d46615088d69667c0b1bbe214 /mysql-test/r/mysqlcheck.result | |
| parent | 0d732a1470dc443c636493f2b6d4db269b250241 (diff) | |
| download | mariadb-git-b8ce8ad1d5168371bde4c4d3de2a22d3c725a57f.tar.gz | |
WL #1034 (Internal CRON) pre-push fixes
after another merge fixes.
mysql-test/r/information_schema.result:
WL #1034 (Internal CRON)
fix result
mysql-test/r/mysqlcheck.result:
WL #1034 (Internal CRON)
fix result
mysql-test/r/sp.result:
WL #1034 (Internal CRON)
fix result
sql/event.cc:
after fixes for WL1012 fix these to be able to compile
sql/event_timed.cc:
after fixes for WL1012 fix these to be able to compile
sql/share/errmsg.txt:
readd error messages removed during manual update
sql/sql_yacc.yy:
fix sql_yacc.yy for WL#1034 (Internal CRON) after the manual
merge. The merge wasn't good :(
Diffstat (limited to 'mysql-test/r/mysqlcheck.result')
| -rw-r--r-- | mysql-test/r/mysqlcheck.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result index b2202ff10d0..1d6bfda0f55 100644 --- a/mysql-test/r/mysqlcheck.result +++ b/mysql-test/r/mysqlcheck.result @@ -1,5 +1,6 @@ mysql.columns_priv OK mysql.db OK +mysql.event OK mysql.func OK mysql.help_category OK mysql.help_keyword OK @@ -18,6 +19,7 @@ mysql.time_zone_transition_type OK mysql.user OK mysql.columns_priv OK mysql.db OK +mysql.event OK mysql.func OK mysql.help_category OK mysql.help_keyword OK |