diff options
| author | unknown <knielsen@mysql.com> | 2006-05-18 13:35:15 +0200 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2006-05-18 13:35:15 +0200 |
| commit | 41200a075d157ea757225189d9be383cca94b0fa (patch) | |
| tree | 847a76ed2ef2cccf78aa1f73cde98c4e9761d916 /mysql-test/r | |
| parent | 1875f3155cab7ded3cf80cdc78b086a023aad774 (diff) | |
| download | mariadb-git-41200a075d157ea757225189d9be383cca94b0fa.tar.gz | |
After-merge fix.
mysql-test/r/sp.result:
After-merge fixes
mysql-test/r/trigger-grant.result:
After-merge fixes
mysql-test/t/trigger-grant.test:
After-merge fixes
sql/sql_insert.cc:
After-merge fixes
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/sp.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/trigger-grant.result | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index 29709dd38d7..8330c391715 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -4920,7 +4920,7 @@ create table t3 as select bug12472() as i| show create table t3| Table Create Table t3 CREATE TABLE `t3` ( - `i` int(11) default NULL + `i` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t3| i @@ -4931,7 +4931,7 @@ create table t3 as select * from v1| show create table t3| Table Create Table t3 CREATE TABLE `t3` ( - `j` bigint(11) default NULL + `j` bigint(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 select * from t3| j diff --git a/mysql-test/r/trigger-grant.result b/mysql-test/r/trigger-grant.result index 704dc793b99..fec5d4812d9 100644 --- a/mysql-test/r/trigger-grant.result +++ b/mysql-test/r/trigger-grant.result @@ -376,7 +376,7 @@ CREATE TABLE t1 (i1 INT); CREATE TABLE t2 (i1 INT); CREATE USER mysqltest_dfn@localhost; CREATE USER mysqltest_inv@localhost; -GRANT EXECUTE, CREATE ROUTINE, SUPER ON *.* TO mysqltest_dfn@localhost; +GRANT EXECUTE, CREATE ROUTINE, TRIGGER ON *.* TO mysqltest_dfn@localhost; GRANT INSERT ON mysqltest_db1.* TO mysqltest_inv@localhost; CREATE PROCEDURE p1(OUT i INT) DETERMINISTIC NO SQL SET i = 3; CREATE PROCEDURE p2(INOUT i INT) DETERMINISTIC NO SQL SET i = i * 5; |