Commit 469d7c12 authored by unknown's avatar unknown
Browse files

merge 


sql/mysql_priv.h:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
parents 59e6d106 258c9e9d

mysql-test/r/information_schema.result

+23 −1
Original line number Diff line number Diff line
@@ -594,7 +594,7 @@ TABLE_CONSTRAINTS 
TABLE_PRIVILEGES

TRIGGERS

create database information_schema;

ERROR HY000: Can't create database 'information_schema'; database exists

ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

use information_schema;

show full tables like "T%";

Tables_in_information_schema (T%)	Table_type
@@ -990,3 +990,25 @@ Field Type Null Key Default Extra 
c	int(11)	YES		NULL	

drop view v1;

drop table t1;

alter database information_schema;

ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

drop database information_schema;

ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

drop table information_schema.tables;

ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

alter table information_schema.tables;

ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

use information_schema;

create temporary table schemata(f1 char(10));

ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

CREATE PROCEDURE p1 ()

BEGIN

SELECT 'foo' FROM DUAL;

END |

ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

select  ROUTINE_NAME from routines;

ROUTINE_NAME

grant all on information_schema.* to 'user1'@'localhost';

ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

grant select on information_schema.* to 'user1'@'localhost';

ERROR 42000: Access denied for user 'root'@'localhost' to database 'information_schema'

mysql-test/r/ndb_bitfield.result

+58 −0
Original line number Diff line number Diff line
@@ -140,6 +140,64 @@ b+0 
499

drop table t1;

create table t1 (

dummyKey INTEGER NOT NULL,

a001 TINYINT,

a010 TINYINT,

a012 TINYINT,

a015 TINYINT,

a016 TINYINT,

a017 TINYINT,

a019 TINYINT,

a029 TINYINT,

a030 TINYINT,

a031 TINYINT,

a032 TINYINT,

a042 TINYINT,

a043 TINYINT,

a044 TINYINT,

a3001 TINYINT,

a3002 TINYINT,

a3003 TINYINT,

a3004 TINYINT,

a3005 TINYINT,

a3021 TINYINT,

a3022 TINYINT,

a BIT(6),

b BIT(6),

c BIT(6),

d TINYINT,

e TINYINT,

f TINYINT,

g TINYINT,

h TINYINT,

i TINYINT,

j TINYINT,

k TINYINT,

l TINYINT,

m TINYINT,

n TINYINT,

o TINYINT,

a034 TINYINT,

PRIMARY KEY USING HASH (dummyKey) ) engine=ndb;

INSERT INTO `t1` VALUES

(1,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000001',b'111111',b'111110',4,5,5,5,5,5,5,5,5,5,3,2,1),

(2,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000010',b'000000',b'111101',4,5,5,5,5,5,5,5,5,5,3,2,1),

(3,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000100',b'001111',b'111011',4,5,5,5,5,5,5,5,5,5,3,2,1),

(4,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'001000',b'110000',b'110111',4,5,5,5,5,5,5,5,5,5,3,2,1),

(5,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'010000',b'100001',b'101111',4,5,5,5,5,5,5,5,5,5,3,2,1),

(6,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'100000',b'010010',b'011111',4,5,5,5,5,5,5,5,5,5,3,2,1),

(7,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'000000',b'001100',b'111111',4,5,5,5,5,5,5,5,5,5,3,2,1),

(8,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,b'111111',b'000000',b'000000',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (1,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'','?','>',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (2,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'','\0','=',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (3,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'','',';',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (4,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'','0','7',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (5,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'','!','/',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (6,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,' ','','',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (7,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'\0','','?',4,5,5,5,5,5,5,5,5,5,3,2,1);

INSERT INTO `t1` VALUES (8,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'?','\0','\0',4,5,5,5,5,5,5,5,5,5,3,2,1);

drop table t1;

create table t1 (

pk1 bit(9) not null primary key,

b int

) engine=ndbcluster;

mysql-test/r/sp-error.result

+47 −0
Original line number Diff line number Diff line
@@ -786,3 +786,50 @@ END| 
ERROR 0A000: HANDLER is not allowed in stored procedures

SELECT bug12995()|

ERROR 42000: FUNCTION test.bug12995 does not exist

drop procedure if exists bug12712;

drop function if exists bug12712;

create procedure bug12712()

set session autocommit = 0;

select @@autocommit;

@@autocommit

1

set @au = @@autocommit;

call bug12712();

select @@autocommit;

@@autocommit

0

set session autocommit = @au;

create function bug12712()

returns int

begin

call bug12712();

return 0;

end|

set @x = bug12712()|

ERROR HY000: Not allowed to set autocommit from a stored function or trigger

drop procedure bug12712|

drop function bug12712|

create function bug12712()

returns int

begin

set session autocommit = 0;

return 0;

end|

ERROR HY000: Not allowed to set autocommit from a stored function or trigger

create function bug12712()

returns int

begin

set @@autocommit = 0;

return 0;

end|

ERROR HY000: Not allowed to set autocommit from a stored function or trigger

create function bug12712()

returns int

begin

set local autocommit = 0;

return 0;

end|

ERROR HY000: Not allowed to set autocommit from a stored function or trigger

create trigger bug12712

before insert on t1 for each row set session autocommit = 0;

ERROR HY000: Not allowed to set autocommit from a stored function or trigger

mysql-test/r/sp.result

+17 −0
Original line number Diff line number Diff line
@@ -3323,6 +3323,7 @@ drop function bug12379| 
drop procedure bug12379_1|

drop procedure bug12379_2|

drop procedure bug12379_3|

drop table t3|

drop procedure if exists bug13124|

create procedure bug13124()

begin
@@ -3331,4 +3332,20 @@ set @x=y; 
end|

call bug13124()|

drop procedure  bug13124|

drop procedure if exists bug12979_1|

create procedure bug12979_1(inout d decimal(5)) set d = d / 2|

set @bug12979_user_var = NULL|

call bug12979_1(@bug12979_user_var)|

drop procedure bug12979_1|

drop procedure if exists bug12979_2|

create procedure bug12979_2()

begin

declare internal_var decimal(5);

set internal_var= internal_var / 2;

select internal_var;

end|

call bug12979_2()|

internal_var

NULL

drop procedure bug12979_2|

drop table t1,t2;

mysql-test/r/type_newdecimal.result

+3 −0
Original line number Diff line number Diff line
@@ -1016,3 +1016,6 @@ v tdec 
v	tdec

9	0

drop procedure wg2;

select cast(@non_existing_user_var/2 as DECIMAL);

cast(@non_existing_user_var/2 as DECIMAL)

NULL