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 | |
| 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')
| -rw-r--r-- | mysql-test/r/information_schema.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/mysqlcheck.result | 2 | ||||
| -rw-r--r-- | mysql-test/r/sp.result | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index bb313191f54..5357220b6c5 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -728,7 +728,7 @@ CREATE TABLE t_crashme ( f1 BIGINT); CREATE VIEW a1 (t_CRASHME) AS SELECT f1 FROM t_crashme GROUP BY f1; CREATE VIEW a2 AS SELECT t_CRASHME FROM a1; count(*) -105 +106 drop view a2, a1; drop table t_crashme; select table_schema,table_name, column_name from @@ -811,7 +811,7 @@ flush privileges; SELECT table_schema, count(*) FROM information_schema.TABLES GROUP BY TABLE_SCHEMA; table_schema count(*) information_schema 19 -mysql 18 +mysql 19 create table t1 (i int, j int); create trigger trg1 before insert on t1 for each row begin 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 diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index d102eb189d3..ec9fba40c23 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -2116,6 +2116,7 @@ Create view Tables To create new views Create user Server Admin To create new users Delete Tables To delete existing rows Drop Databases,Tables To drop databases, tables, and views +Event Server Admin Creation, alteration, deletion and execution of events. Execute Functions,Procedures To execute stored routines File File access on server To read and write files on the server Grant option Databases,Tables,Functions,Procedures To give to other users those privileges you possess @@ -2170,6 +2171,7 @@ Create view Tables To create new views Create user Server Admin To create new users Delete Tables To delete existing rows Drop Databases,Tables To drop databases, tables, and views +Event Server Admin Creation, alteration, deletion and execution of events. Execute Functions,Procedures To execute stored routines File File access on server To read and write files on the server Grant option Databases,Tables,Functions,Procedures To give to other users those privileges you possess |