Commit 655470ce authored by unknown's avatar unknown
Browse files

Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
configure.in:
  Manual merge.
mysql-test/r/grant.result:
  manual merge.
parents ef72dab9 8ea5f31a

configure.in

+9 −6
Original line number Diff line number Diff line
@@ -1530,17 +1530,20 @@ AC_ARG_WITH(debug, 
if test "$with_debug" = "yes"

then

  # Medium debug.

  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DDBUG_ON -DSAFE_MUTEX $CXXFLAGS"

  AC_DEFINE([DBUG_ON], [1], [Use libdbug])

  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"

elif test "$with_debug" = "full"

then

  # Full debug. Very slow in some cases

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

  AC_DEFINE([DBUG_ON], [1], [Use libdbug])

  CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

else

  # Optimized version. No debug

  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"

  CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS"

  AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug])

  CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"

  CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"

fi



# If we should allow error injection tests

mysql-test/r/grant.result

+288 −0
Original line number Diff line number Diff line
@@ -659,6 +659,294 @@ delete from mysql.db where user='mysqltest1'; 
delete from mysql.tables_priv where user='mysqltest1';

flush privileges;

drop database mysqltest;

use test;

create table t1 (a int);

create table t2 as select * from mysql.user where user='';

delete from mysql.user where user='';

flush privileges;

create user mysqltest_8@'';

create user mysqltest_8;

create user mysqltest_8@host8;

create user mysqltest_8@'';

ERROR HY000: Operation CREATE USER failed for 'mysqltest_8'@''

create user mysqltest_8;

ERROR HY000: Operation CREATE USER failed for 'mysqltest_8'@'%'

create user mysqltest_8@host8;

ERROR HY000: Operation CREATE USER failed for 'mysqltest_8'@'host8'

select user, QUOTE(host) from mysql.user where user="mysqltest_8";

user	QUOTE(host)

mysqltest_8	''

mysqltest_8	'%'

mysqltest_8	'host8'

Schema privileges

grant select on mysqltest.* to mysqltest_8@'';

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

GRANT SELECT ON `mysqltest`.* TO 'mysqltest_8'@''

grant select on mysqltest.* to mysqltest_8@;

show grants for mysqltest_8@;

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

GRANT SELECT ON `mysqltest`.* TO 'mysqltest_8'@''

grant select on mysqltest.* to mysqltest_8;

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

GRANT SELECT ON `mysqltest`.* TO 'mysqltest_8'@'%'

select * from  information_schema.schema_privileges

where grantee like "'mysqltest_8'%";

GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE

'mysqltest_8'@'%'	NULL	mysqltest	SELECT	NO

'mysqltest_8'@''	NULL	mysqltest	SELECT	NO

select * from t1;

a

revoke select on mysqltest.* from mysqltest_8@'';

revoke select on mysqltest.* from mysqltest_8;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

select * from  information_schema.schema_privileges

where grantee like "'mysqltest_8'%";

GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	PRIVILEGE_TYPE	IS_GRANTABLE

flush privileges;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

show grants for mysqltest_8@;

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

grant select on mysqltest.* to mysqltest_8@'';

flush privileges;

show grants for mysqltest_8@;

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

GRANT SELECT ON `mysqltest`.* TO 'mysqltest_8'@''

revoke select on mysqltest.* from mysqltest_8@'';

flush privileges;

Column privileges

grant update (a) on t1 to mysqltest_8@'';

grant update (a) on t1 to mysqltest_8;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@'%'

flush privileges;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

GRANT UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@'%'

select * from  information_schema.column_privileges;

GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	PRIVILEGE_TYPE	IS_GRANTABLE

'mysqltest_8'@'%'	NULL	test	t1	a	UPDATE	NO

'mysqltest_8'@''	NULL	test	t1	a	UPDATE	NO

select * from t1;

a

revoke update (a) on t1 from mysqltest_8@'';

revoke update (a) on t1 from mysqltest_8;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

select * from  information_schema.column_privileges;

GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	PRIVILEGE_TYPE	IS_GRANTABLE

flush privileges;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

Table privileges

grant update on t1 to mysqltest_8@'';

grant update on t1 to mysqltest_8;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@'%'

flush privileges;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

GRANT UPDATE ON `test`.`t1` TO 'mysqltest_8'@'%'

select * from  information_schema.table_privileges;

GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE

'mysqltest_8'@'%'	NULL	test	t1	UPDATE	NO

'mysqltest_8'@''	NULL	test	t1	UPDATE	NO

select * from t1;

a

revoke update on t1 from mysqltest_8@'';

revoke update on t1 from mysqltest_8;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

select * from  information_schema.table_privileges;

GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE

flush privileges;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

"DROP USER" should clear privileges

grant all privileges on mysqltest.* to mysqltest_8@'';

grant select on mysqltest.* to mysqltest_8@'';

grant update on t1 to mysqltest_8@'';

grant update (a) on t1 to mysqltest_8@'';

grant all privileges on mysqltest.* to mysqltest_8;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@''

GRANT UPDATE, UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@'%'

select * from  information_schema.user_privileges

where grantee like "'mysqltest_8'%";

GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE

'mysqltest_8'@'host8'	NULL	USAGE	NO

'mysqltest_8'@'%'	NULL	USAGE	NO

'mysqltest_8'@''	NULL	USAGE	NO

select * from t1;

a

flush privileges;

show grants for mysqltest_8@'';

Grants for mysqltest_8@

GRANT USAGE ON *.* TO 'mysqltest_8'@''

GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@''

GRANT UPDATE, UPDATE (a) ON `test`.`t1` TO 'mysqltest_8'@''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@'%'

drop user mysqltest_8@'';

show grants for mysqltest_8@'';

ERROR 42000: There is no such grant defined for user 'mysqltest_8' on host ''

show grants for mysqltest_8;

Grants for mysqltest_8@%

GRANT USAGE ON *.* TO 'mysqltest_8'@'%'

GRANT ALL PRIVILEGES ON `mysqltest`.* TO 'mysqltest_8'@'%'

select * from  information_schema.user_privileges

where grantee like "'mysqltest_8'%";

GRANTEE	TABLE_CATALOG	PRIVILEGE_TYPE	IS_GRANTABLE

'mysqltest_8'@'host8'	NULL	USAGE	NO

'mysqltest_8'@'%'	NULL	USAGE	NO

drop user mysqltest_8;

connect(localhost,mysqltest_8,,test,MASTER_PORT,MASTER_SOCKET);

ERROR 28000: Access denied for user 'mysqltest_8'@'localhost' (using password: NO)

show grants for mysqltest_8;

ERROR 42000: There is no such grant defined for user 'mysqltest_8' on host '%'

drop user mysqltest_8@host8;

show grants for mysqltest_8@host8;

ERROR 42000: There is no such grant defined for user 'mysqltest_8' on host 'host8'

insert into mysql.user select * from t2;

flush privileges;

drop table t2;

drop table t1;

CREATE DATABASE mysqltest3;

use mysqltest3;

CREATE TABLE t_nn (c1 INT);

CREATE VIEW  v_nn AS SELECT * FROM t_nn;

CREATE DATABASE mysqltest2;

use mysqltest2;

CREATE TABLE t_nn (c1 INT);

CREATE VIEW  v_nn AS SELECT * FROM t_nn;

CREATE VIEW  v_yn AS SELECT * FROM t_nn;

CREATE VIEW  v_gy AS SELECT * FROM t_nn;

CREATE VIEW  v_ny AS SELECT * FROM t_nn;

CREATE VIEW  v_yy AS SELECT * FROM t_nn WHERE c1=55;

GRANT SHOW VIEW        ON mysqltest2.v_ny TO 'mysqltest_1'@'localhost' IDENTIFIED BY 'mysqltest_1';

GRANT SELECT           ON mysqltest2.v_yn TO 'mysqltest_1'@'localhost' IDENTIFIED BY 'mysqltest_1';

GRANT SELECT           ON mysqltest2.*    TO 'mysqltest_1'@'localhost' IDENTIFIED BY 'mysqltest_1';

GRANT SHOW VIEW,SELECT ON mysqltest2.v_yy TO 'mysqltest_1'@'localhost' IDENTIFIED BY 'mysqltest_1';

SHOW CREATE VIEW  mysqltest2.v_nn;

ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'

SHOW CREATE TABLE mysqltest2.v_nn;

ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'

SHOW CREATE VIEW  mysqltest2.v_yn;

ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_yn'

SHOW CREATE TABLE mysqltest2.v_yn;

ERROR 42000: SHOW VIEW command denied to user 'mysqltest_1'@'localhost' for table 'v_yn'

SHOW CREATE TABLE mysqltest2.v_ny;

View	Create View

v_ny	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `mysqltest2`.`v_ny` AS select `mysqltest2`.`t_nn`.`c1` AS `c1` from `mysqltest2`.`t_nn`

SHOW CREATE VIEW  mysqltest2.v_ny;

View	Create View

v_ny	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `mysqltest2`.`v_ny` AS select `mysqltest2`.`t_nn`.`c1` AS `c1` from `mysqltest2`.`t_nn`

SHOW CREATE TABLE mysqltest3.t_nn;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't_nn'

SHOW CREATE VIEW  mysqltest3.t_nn;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 't_nn'

SHOW CREATE VIEW  mysqltest3.v_nn;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'

SHOW CREATE TABLE mysqltest3.v_nn;

ERROR 42000: SELECT command denied to user 'mysqltest_1'@'localhost' for table 'v_nn'

SHOW CREATE TABLE mysqltest2.t_nn;

Table	Create Table

t_nn	CREATE TABLE `t_nn` (

  `c1` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SHOW CREATE VIEW  mysqltest2.t_nn;

ERROR HY000: 'mysqltest2.t_nn' is not VIEW

SHOW CREATE VIEW mysqltest2.v_yy;

View	Create View

v_yy	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `mysqltest2`.`v_yy` AS select `mysqltest2`.`t_nn`.`c1` AS `c1` from `mysqltest2`.`t_nn` where (`mysqltest2`.`t_nn`.`c1` = 55)

SHOW CREATE TABLE mysqltest2.v_yy;

View	Create View

v_yy	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `mysqltest2`.`v_yy` AS select `mysqltest2`.`t_nn`.`c1` AS `c1` from `mysqltest2`.`t_nn` where (`mysqltest2`.`t_nn`.`c1` = 55)

SHOW CREATE TABLE mysqltest2.v_nn;

View	Create View

v_nn	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v_nn` AS select `t_nn`.`c1` AS `c1` from `t_nn`

SHOW CREATE VIEW  mysqltest2.v_nn;

View	Create View

v_nn	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v_nn` AS select `t_nn`.`c1` AS `c1` from `t_nn`

SHOW CREATE TABLE mysqltest2.t_nn;

Table	Create Table

t_nn	CREATE TABLE `t_nn` (

  `c1` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SHOW CREATE VIEW mysqltest2.t_nn;

ERROR HY000: 'mysqltest2.t_nn' is not VIEW

DROP VIEW  mysqltest2.v_nn;

DROP VIEW  mysqltest2.v_yn;

DROP VIEW  mysqltest2.v_ny;

DROP VIEW  mysqltest2.v_yy;

DROP TABLE mysqltest2.t_nn;

DROP DATABASE mysqltest2;

DROP VIEW  mysqltest3.v_nn;

DROP TABLE mysqltest3.t_nn;

DROP DATABASE mysqltest3;

REVOKE ALL PRIVILEGES, GRANT OPTION FROM 'mysqltest_1'@'localhost';

DROP USER 'mysqltest_1'@'localhost';

create user mysqltest1_thisisreallytoolong;

ERROR HY000: Operation CREATE USER failed for 'mysqltest1_thisisreallytoolong'@'%'

GRANT CREATE ON mysqltest.* TO 1234567890abcdefGHIKL@localhost;

ERROR HY000: String '1234567890abcdefGHIKL' is too long for user name (should be no longer than 16)

GRANT CREATE ON mysqltest.* TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;

mysql-test/r/view.result

+28 −27
Original line number Diff line number Diff line
@@ -2871,33 +2871,7 @@ CREATE DEFINER=some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890 
VIEW v2 AS SELECT b FROM t1;

ERROR HY000: String '1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY' is too long for host name (should be no longer than 60)

DROP TABLE t1;

DROP FUNCTION IF EXISTS f1;

DROP FUNCTION IF EXISTS f2;

DROP VIEW IF EXISTS v1, v2;

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (i INT);

CREATE VIEW v1 AS SELECT * FROM t1;

CREATE FUNCTION f1() RETURNS INT

BEGIN

INSERT INTO v1 VALUES (0);

RETURN 0;

END |

SELECT f1();

f1()

0

CREATE ALGORITHM=TEMPTABLE VIEW v2 AS SELECT * FROM t1;

CREATE FUNCTION f2() RETURNS INT

BEGIN

INSERT INTO v2 VALUES (0);

RETURN 0;

END |

SELECT f2();

ERROR HY000: The target table v2 of the INSERT is not updatable

DROP FUNCTION f1;

DROP FUNCTION f2;

DROP VIEW v1, v2;

DROP TABLE t1;

End of 5.0 tests.

DROP VIEW IF EXISTS v1;

CREATE DATABASE bug21261DB;

USE bug21261DB;

CREATE TABLE t1 (x INT);
@@ -2927,3 +2901,30 @@ View Create View 
v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` where (`t1`.`f1` between now() and (now() + interval 1 minute))

drop view v1;

drop table t1;

DROP FUNCTION IF EXISTS f1;

DROP FUNCTION IF EXISTS f2;

DROP VIEW IF EXISTS v1, v2;

DROP TABLE IF EXISTS t1;

CREATE TABLE t1 (i INT);

CREATE VIEW v1 AS SELECT * FROM t1;

CREATE FUNCTION f1() RETURNS INT

BEGIN

INSERT INTO v1 VALUES (0);

RETURN 0;

END |

SELECT f1();

f1()

0

CREATE ALGORITHM=TEMPTABLE VIEW v2 AS SELECT * FROM t1;

CREATE FUNCTION f2() RETURNS INT

BEGIN

INSERT INTO v2 VALUES (0);

RETURN 0;

END |

SELECT f2();

ERROR HY000: The target table v2 of the INSERT is not updatable

DROP FUNCTION f1;

DROP FUNCTION f2;

DROP VIEW v1, v2;

DROP TABLE t1;

End of 5.0 tests.

mysql-test/t/grant.test

+0 −51
Original line number Diff line number Diff line
@@ -682,57 +682,6 @@ drop table t2; 


drop table t1;





#

# Test for BUG#16899: Possible buffer overflow in handling of DEFINER-clause.

#

# These checks are intended to ensure that appropriate errors are risen when

# illegal user name or hostname is specified in user-clause of GRANT/REVOKE

# statements.

#



# Working with database-level privileges.



--error ER_WRONG_STRING_LENGTH

GRANT CREATE ON mysqltest.* TO 1234567890abcdefGHIKL@localhost;



--error ER_WRONG_STRING_LENGTH

GRANT CREATE ON mysqltest.* TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;



--error ER_WRONG_STRING_LENGTH

REVOKE CREATE ON mysqltest.* FROM 1234567890abcdefGHIKL@localhost;



--error ER_WRONG_STRING_LENGTH

REVOKE CREATE ON mysqltest.* FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;



# Working with table-level privileges.



--error ER_WRONG_STRING_LENGTH

GRANT CREATE ON t1 TO 1234567890abcdefGHIKL@localhost;



--error ER_WRONG_STRING_LENGTH

GRANT CREATE ON t1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;



--error ER_WRONG_STRING_LENGTH

REVOKE CREATE ON t1 FROM 1234567890abcdefGHIKL@localhost;



--error ER_WRONG_STRING_LENGTH

REVOKE CREATE ON t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;



# Working with routine-level privileges.



--error ER_WRONG_STRING_LENGTH

GRANT EXECUTE ON PROCEDURE p1 TO 1234567890abcdefGHIKL@localhost;



--error ER_WRONG_STRING_LENGTH

GRANT EXECUTE ON PROCEDURE p1 TO some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;



--error ER_WRONG_STRING_LENGTH

REVOKE EXECUTE ON PROCEDURE p1 FROM 1234567890abcdefGHIKL@localhost;



--error ER_WRONG_STRING_LENGTH

REVOKE EXECUTE ON PROCEDURE t1 FROM some_user_name@1234567890abcdefghij1234567890abcdefghij1234567890abcdefghijQWERTY;



#

# Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non

#            privileged view

mysql-test/t/view.test

+1 −3
Original line number Diff line number Diff line
@@ -2822,9 +2822,6 @@ DROP FUNCTION f2; 
DROP VIEW v1, v2;

DROP TABLE t1;





--echo End of 5.0 tests.



#

# Bug #21261: Wrong access rights was required for an insert to a view

#
@@ -2866,3 +2863,4 @@ create view v1 as select * from t1 where f1 between now() and now() + interval 1 
show create view v1;

drop view v1;

drop table t1;

--echo End of 5.0 tests.