Commit 8ed5fb5a authored by kent@kent-amd64.(none)'s avatar kent@kent-amd64.(none)
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build 

into  mysql.com:/home/kent/bk/build/mysql-5.1-build
parents ea442919 2038eeb8

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -3012,3 +3012,6 @@ win/vs8cache.txt 
ylwrap

zlib/*.ds?

zlib/*.vcproj

mysql-test/funcs_1.log

mysql-test/funcs_1.tar

mysql-test/suite/funcs_1.tar.gz

mysql-test/suite/funcs_1/r/innodb_storedproc.result

+2840 −1324

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/suite/funcs_1/r/innodb_storedproc_10.result

+93 −18
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; 


Section 3.1.10 - CALL checks:

--------------------------------------------------------------------------------

USE db_storedproc;



Testcase 3.1.10.2 + 3.1.10.5:

-----------------------------
@@ -94,6 +95,7 @@ CALL sp31102(); 
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'

SELECT fn31105( 9 );

ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'

connection default;

USE db_storedproc;

	

root@localhost	db_storedproc
@@ -114,6 +116,7 @@ a` a` 1000-01-01 -5000 a` -5000 
SELECT fn31105( 9 );

fn31105( 9 )

81

connection default;

USE db_storedproc;

	

root@localhost	db_storedproc
@@ -180,6 +183,8 @@ DROP PROCEDURE IF EXISTS sp_ins_1; 
DROP PROCEDURE IF EXISTS sp_ins_3;

DROP PROCEDURE IF EXISTS sp_upd;

DROP PROCEDURE IF EXISTS sp_ins_upd;

DROP PROCEDURE IF EXISTS sp_del;

DROP PROCEDURE IF EXISTS sp_with_rowcount;

CREATE TABLE temp(f1 CHAR(20),f2 CHAR(25),f3 DATE,f4 INT,f5 CHAR(25),f6 INT);

INSERT INTO temp SELECT * FROM t10;

CREATE PROCEDURE sp_ins_1()
@@ -207,49 +212,72 @@ END; 
SELECT COUNT( f1 ), f1 FROM temp GROUP BY f1;

UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f1 ='qwe' AND temp.f2 = 'abc';

END//

CREATE PROCEDURE sp_del()

BEGIN

DELETE FROM temp WHERE temp.f1 ='qwe' OR temp.f1 = 'updated_2';

END//

CREATE PROCEDURE sp_with_rowcount()

BEGIN

BEGIN

INSERT INTO temp VALUES  ('qwe', 'abc', '1989-11-09', 100, 'uvw', 1000),

('qwe', 'xyz', '1998-03-26', 100, 'uvw', 1000),

('qwe', 'abc', '2000-11-09', 100, 'uvw', 1000),

('qwe', 'xyz', '2005-11-07', 100, 'uvw', 1000);

END;

SELECT row_count() AS 'row_count() after insert';

SELECT row_count() AS 'row_count() after select row_count()';

SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;

UPDATE temp SET temp.f1 = 'updated_2' WHERE temp.f2 = 'abc';

SELECT row_count() AS 'row_count() after update';

SELECT f1,f2,f3 FROM temp ORDER BY f1,f2,f3;

DELETE FROM temp WHERE temp.f1 = 'updated_2';

SELECT row_count() AS 'row_count() after delete';

END//

CALL sp_ins_1();

SELECT row_count();

row_count()

1

SELECT * FROM temp ORDER BY f4;

SELECT * FROM temp;

f1	f2	f3	f4	f5	f6

a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992

a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991

a`	a`	1000-01-01	-5000	a`	-5000

aaa	aaa	1000-01-02	-4999	aaa	-4999

abaa	abaa	1000-01-03	-4998	abaa	-4998

abc	abc	2005-10-03	100	uvw	1000

acaaa	acaaa	1000-01-04	-4997	acaaa	-4997

adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996

aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995

afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994

agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993

a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992

a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991

abc	abc	2005-10-03	100	uvw	1000

CALL sp_ins_3();

SELECT row_count();

row_count()

1

SELECT * FROM temp ORDER BY f4;

SELECT * FROM temp;

f1	f2	f3	f4	f5	f6

a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992

a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991

a`	a`	1000-01-01	-5000	a`	-5000

aaa	aaa	1000-01-02	-4999	aaa	-4999

abaa	abaa	1000-01-03	-4998	abaa	-4998

abc	abc	2005-10-03	100	uvw	1000

abc	xyz	1949-05-23	100	uvw	1000

abc	xyz	1989-11-09	100	uvw	1000

abc	xyz	2005-10-24	100	uvw	1000

acaaa	acaaa	1000-01-04	-4997	acaaa	-4997

adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996

aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995

afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994

agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993

a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992

a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991

abc	abc	2005-10-03	100	uvw	1000

abc	xyz	1949-05-23	100	uvw	1000

abc	xyz	1989-11-09	100	uvw	1000

abc	xyz	2005-10-24	100	uvw	1000

CALL sp_upd();

SELECT row_count();

row_count()

4

SELECT * FROM temp ORDER BY f4;

SELECT * FROM temp;

f1	f2	f3	f4	f5	f6

a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992

a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991

a`	a`	1000-01-01	-5000	a`	-5000

aaa	aaa	1000-01-02	-4999	aaa	-4999

abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -258,8 +286,6 @@ adaaaa adaaaa 1000-01-05 -4996 adaaaa -4996 
aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995

afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994

agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993

a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992

a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991

updated	abc	2005-10-03	100	uvw	1000

updated	xyz	1949-05-23	100	uvw	1000

updated	xyz	1989-11-09	100	uvw	1000
@@ -281,8 +307,10 @@ COUNT( f1 ) f1 
SELECT row_count();

row_count()

3

SELECT * FROM temp ORDER BY f4;

SELECT * FROM temp;

f1	f2	f3	f4	f5	f6

a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992

a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991

a`	a`	1000-01-01	-5000	a`	-5000

aaa	aaa	1000-01-02	-4999	aaa	-4999

abaa	abaa	1000-01-03	-4998	abaa	-4998
@@ -291,20 +319,67 @@ adaaaa adaaaa 1000-01-05 -4996 adaaaa -4996 
aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995

afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994

agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993

a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992

a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991

qwe	xyz	1998-03-26	100	uvw	1000

updated	abc	2005-10-03	100	uvw	1000

updated	xyz	1949-05-23	100	uvw	1000

updated	xyz	1989-11-09	100	uvw	1000

updated	xyz	2005-10-24	100	uvw	1000

updated_2	abc	1989-11-09	100	uvw	1000

qwe	xyz	1998-03-26	100	uvw	1000

updated_2	abc	2000-11-09	100	uvw	1000

updated_2	abc	2005-11-07	100	uvw	1000

CALL sp_del();

SELECT row_count();

row_count()

4

SELECT * FROM temp;

f1	f2	f3	f4	f5	f6

a^aaaaaaaa	a^aaaaaaaa	1000-01-09	-4992	a^aaaaaaaa	-4992

a_aaaaaaaaa	a_aaaaaaaaa	1000-01-10	-4991	a_aaaaaaaaa	-4991

a`	a`	1000-01-01	-5000	a`	-5000

aaa	aaa	1000-01-02	-4999	aaa	-4999

abaa	abaa	1000-01-03	-4998	abaa	-4998

acaaa	acaaa	1000-01-04	-4997	acaaa	-4997

adaaaa	adaaaa	1000-01-05	-4996	adaaaa	-4996

aeaaaaa	aeaaaaa	1000-01-06	-4995	aeaaaaa	-4995

afaaaaaa	afaaaaaa	1000-01-07	-4994	afaaaaaa	-4994

agaaaaaaa	agaaaaaaa	1000-01-08	-4993	agaaaaaaa	-4993

updated	abc	2005-10-03	100	uvw	1000

updated	xyz	1949-05-23	100	uvw	1000

updated	xyz	1989-11-09	100	uvw	1000

updated	xyz	2005-10-24	100	uvw	1000

DELETE FROM temp;

CALL sp_with_rowcount();

row_count() after insert

4

row_count() after select row_count()

-1

f1	f2	f3

qwe	abc	1989-11-09

qwe	abc	2000-11-09

qwe	xyz	1998-03-26

qwe	xyz	2005-11-07

row_count() after update

2

f1	f2	f3

qwe	xyz	1998-03-26

qwe	xyz	2005-11-07

updated_2	abc	1989-11-09

updated_2	abc	2000-11-09

row_count() after delete

2

SELECT row_count();

row_count()

-1

SELECT * FROM temp;

f1	f2	f3	f4	f5	f6

qwe	xyz	1998-03-26	100	uvw	1000

qwe	xyz	2005-11-07	100	uvw	1000

DROP PROCEDURE sp_ins_1;

DROP PROCEDURE sp_ins_3;

DROP PROCEDURE sp_upd;

DROP PROCEDURE sp_ins_upd;

DROP PROCEDURE sp_del;

DROP PROCEDURE sp_with_rowcount;

DROP TABLE temp;



Testcase 3.1.10.8:

mysql-test/suite/funcs_1/r/innodb_trig_03.result

+31 −47
Original line number Diff line number Diff line
@@ -184,15 +184,14 @@ insert 3.5.3.2-no 
insert 3.5.3.6-no

trig 3.5.3.2_2-yes

trig 3.5.3.2_2-yes



Trigger create disabled - should fail - Bug 8884

------------------------------------------------

create trigger trg4a_1 before INSERT on t1 for each row

set new.f1 = 'trig 3.5.3.7-1a';

insert into t1 (f1) values ('insert 3.5.3.7-1a');

ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'

select f1 from t1 order by f1;

f1

insert 3.5.3.2-no

insert 3.5.3.6-no

insert 3.5.3.7-1a

trig 3.5.3.2_2-yes

trig 3.5.3.2_2-yes

drop trigger trg4a_1;
@@ -210,7 +209,6 @@ select f1 from t1 order by f1; 
f1

insert 3.5.3.2-no

insert 3.5.3.6-no

insert 3.5.3.7-1a

trig 3.5.3.2_2-yes

trig 3.5.3.2_2-yes

trig 3.5.3.7-2a
@@ -239,29 +237,27 @@ Grants for test_noprivs@localhost 
GRANT USAGE ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'

GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'

use priv_db;



Trigger create disabled - should fail - Bug 8884

------------------------------------------------

create trigger trg4b_1 before UPDATE on t1 for each row

set new.f1 = 'trig 3.5.3.7-1b';

insert into t1 (f1) values ('insert 3.5.3.7-1b');

select f1 from t1 order by f1;

f1

insert 3.5.3.2-no

insert 3.5.3.6-no

insert 3.5.3.7-1a

insert 3.5.3.7-1b

trig 3.5.3.2_2-yes

trig 3.5.3.2_2-yes

trig 3.5.3.7-2a

update t1 set  f1 = 'update 3.5.3.7-1b' where f1 = 'insert 3.5.3.7-1b';

ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'

select f1 from t1 order by f1;

f1

insert 3.5.3.2-no

insert 3.5.3.6-no

insert 3.5.3.7-1a

insert 3.5.3.7-1b

trig 3.5.3.2_2-yes

trig 3.5.3.2_2-yes

trig 3.5.3.7-2a

update 3.5.3.7-1b

drop trigger trg4b_1;

show grants;

Grants for test_yesprivs@localhost
@@ -275,23 +271,21 @@ select f1 from t1 order by f1; 
f1

insert 3.5.3.2-no

insert 3.5.3.6-no

insert 3.5.3.7-1a

insert 3.5.3.7-1b

insert 3.5.3.7-2b

trig 3.5.3.2_2-yes

trig 3.5.3.2_2-yes

trig 3.5.3.7-2a

update 3.5.3.7-1b

update t1 set  f1 = 'update 3.5.3.7-2b' where f1 = 'insert 3.5.3.7-2b';

select f1 from t1 order by f1;

f1

insert 3.5.3.2-no

insert 3.5.3.6-no

insert 3.5.3.7-1a

insert 3.5.3.7-1b

trig 3.5.3.2_2-yes

trig 3.5.3.2_2-yes

trig 3.5.3.7-2a

trig 3.5.3.7-2b

update 3.5.3.7-1b

drop trigger trg4b_2;



Testcase 3.5.3.7c
@@ -317,21 +311,19 @@ Grants for test_noprivs@localhost 
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'

GRANT SELECT, INSERT, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'

use priv_db;



Trigger create disabled - should fail - Bug 8884

------------------------------------------------

create trigger trg4c_1 before INSERT on t1 for each row

set new.f1 = 'trig 3.5.3.7-1c';

insert into t1 (f1) values ('insert 3.5.3.7-1c');

ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'

select f1 from t1 order by f1;

f1

insert 3.5.3.2-no

insert 3.5.3.6-no

insert 3.5.3.7-1a

insert 3.5.3.7-1c

insert 3.5.3.7-1b

trig 3.5.3.2_2-yes

trig 3.5.3.2_2-yes

trig 3.5.3.7-2a

trig 3.5.3.7-2b

update 3.5.3.7-1b

drop trigger trg4c_1;

show grants;

Grants for test_yesprivs@localhost
@@ -345,14 +337,12 @@ select f1 from t1 order by f1; 
f1

insert 3.5.3.2-no

insert 3.5.3.6-no

insert 3.5.3.7-1a

insert 3.5.3.7-1c

insert 3.5.3.7-1b

trig 3.5.3.2_2-yes

trig 3.5.3.2_2-yes

trig 3.5.3.7-2a

trig 3.5.3.7-2b

trig 3.5.3.7-2c

update 3.5.3.7-1b

drop trigger trg4c_2;



Testcase 3.5.3.7d:
@@ -376,23 +366,20 @@ Grants for test_noprivs@localhost 
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'

GRANT SELECT (f1), INSERT (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'

use priv_db;



Trigger create disabled - should fail - Bug 8884

------------------------------------------------

create trigger trg4d_1 before INSERT on t1 for each row

set new.f1 = 'trig 3.5.3.7-1d';

insert into t1 (f1) values ('insert 3.5.3.7-1d');

ERROR 42000: UPDATE command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'

select f1 from t1 order by f1;

f1

insert 3.5.3.2-no

insert 3.5.3.6-no

insert 3.5.3.7-1a

insert 3.5.3.7-1c

insert 3.5.3.7-1d

insert 3.5.3.7-1b

trig 3.5.3.2_2-yes

trig 3.5.3.2_2-yes

trig 3.5.3.7-2a

trig 3.5.3.7-2b

trig 3.5.3.7-2c

update 3.5.3.7-1b

drop trigger trg4d_1;

show grants;

Grants for test_yesprivs@localhost
@@ -406,16 +393,13 @@ select f1 from t1 order by f1; 
f1

insert 3.5.3.2-no

insert 3.5.3.6-no

insert 3.5.3.7-1a

insert 3.5.3.7-1c

insert 3.5.3.7-1d

insert 3.5.3.7-1b

trig 3.5.3.2_2-yes

trig 3.5.3.2_2-yes

trig 3.5.3.7-2a

trig 3.5.3.7-2b

trig 3.5.3.7-2c

trig 3.5.3.7-2d

update 3.5.3.7-1b

drop trigger trg4d_2;



Testcase 3.5.3.8a:
@@ -440,14 +424,14 @@ use priv_db; 
show grants;

Grants for test_noprivs@localhost

GRANT INSERT, UPDATE, DELETE, CREATE, DROP, RELOAD, SHUTDOWN, PROCESS, FILE, REFERENCES, INDEX, ALTER, SHOW DATABASES, SUPER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, REPLICATION SLAVE, REPLICATION CLIENT, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, CREATE USER, EVENT, TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'



Trigger create disabled - should fail - Bug 8887

------------------------------------------------

create trigger trg5a_1 before INSERT on t1 for each row

set @test_var = new.f1;

set @test_var = 'before trig 3.5.3.8-1a';

select @test_var;

@test_var

before trig 3.5.3.8-1a

insert into t1 (f1) values ('insert 3.5.3.8-1a');

ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'

select @test_var;

@test_var

before trig 3.5.3.8-1a
@@ -495,15 +479,15 @@ Grants for test_noprivs@localhost 
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'

GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES, EXECUTE, CREATE VIEW, SHOW VIEW, CREATE ROUTINE, ALTER ROUTINE, EVENT, TRIGGER ON `priv_db`.* TO 'test_noprivs'@'localhost'

use priv_db;



Trigger create disabled - should fail - Bug 8887

------------------------------------------------

create trigger trg5b_1 before UPDATE on t1 for each row

set @test_var= new.f1;

set @test_var= 'before trig 3.5.3.8-1b';

insert into t1 (f1) values ('insert 3.5.3.8-1b');

select @test_var;

@test_var

before trig 3.5.3.8-1b

update t1 set  f1= 'update 3.5.3.8-1b' where f1 = 'insert 3.5.3.8-1b';

ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'

select @test_var;

@test_var

before trig 3.5.3.8-1b
@@ -550,11 +534,11 @@ Grants for test_noprivs@localhost 
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'

GRANT INSERT, UPDATE, DELETE, CREATE, DROP, REFERENCES, INDEX, ALTER, CREATE VIEW, SHOW VIEW, TRIGGER ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'

use priv_db;



Trigger create disabled - should fail - Bug 8887

------------------------------------------------

create trigger trg5c_1 before INSERT on t1 for each row

set @test_var= new.f1;

set @test_var= 'before trig 3.5.3.8-1c';

insert into t1 (f1) values ('insert 3.5.3.8-1c');

ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'

select @test_var;

@test_var

before trig 3.5.3.8-1c
@@ -596,11 +580,11 @@ Grants for test_noprivs@localhost 
GRANT TRIGGER ON *.* TO 'test_noprivs'@'localhost' IDENTIFIED BY PASSWORD '*C49735D016A099C0CF104EF9183F374A54CA2576'

GRANT INSERT (f1), UPDATE (f1) ON `priv_db`.`t1` TO 'test_noprivs'@'localhost'

use priv_db;



Trigger create disabled - should fail - Bug 8887

------------------------------------------------

create trigger trg5d_1 before INSERT on t1 for each row

set @test_var= new.f1;

set @test_var='before trig 3.5.3.8-1d';

insert into t1 (f1) values ('insert 3.5.3.8-1d');

ERROR 42000: SELECT command denied to user 'test_noprivs'@'localhost' for column 'f1' in table 't1'

select @test_var;

@test_var

before trig 3.5.3.8-1d