database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge heikki@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into hundin.mysql.fi:/home/heikki/mysql-5.0
This commit is contained in:
unknown
2005-03-18 18:56:23 +02:00
parent 9d71772238 8e9219148c
commit 208eed01af
27 changed files with 180 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mysql-test/r/olap.result
View File

@@ -379,3 +379,16 @@ a sum(b)
4 4
NULL 14
DROP TABLE t1;
CREATE TABLE t1 (a int, b int);
INSERT INTO t1 VALUES
(1,4),
(2,2), (2,2),
(4,1), (4,1), (4,1), (4,1),
(2,1), (2,1);
SELECT a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1;
a SUM(b)
1 4
SELECT SQL_CALC_FOUND_ROWS a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1;
a SUM(b)
1 4
DROP TABLE t1;

19
mysql-test/r/sp.result
View File

@@ -2777,4 +2777,23 @@ a
3.2000
drop procedure bug8937|
delete from t1|
drop procedure if exists bug6600|
drop table if exists t3|
drop view if exists v1|
create table t3 (s1 decimal(31,30))|
create view v1 as select * from t3|
create procedure bug6600()
check table v1|
call bug6600()|
Table Op Msg_type Msg_text
test.v1 check status OK
call bug6600()|
Table Op Msg_type Msg_text
test.v1 check status OK
call bug6600()|
Table Op Msg_type Msg_text
test.v1 check status OK
drop procedure bug6600|
drop view v1|
drop table t3|
drop table t1,t2;

24
mysql-test/r/sp_trans.result
View File

@@ -1,22 +1,22 @@
drop procedure if exists sp1;
drop procedure if exists bug8850|
create table t1 (a int) engine=innodb|
create procedure sp1 ()
create procedure bug8850()
begin
truncate table t1; insert t1 values (1); rollback;
end|
set autocommit=0;
insert t1 values (2);
call sp1();
set autocommit=0|
insert t1 values (2)|
call bug8850()|
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
commit;
select * from t1;
commit|
select * from t1|
a
2
call sp1();
call bug8850()|
ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
set autocommit=1;
select * from t1;
set autocommit=1|
select * from t1|
a
2
drop table t1;
drop procedure sp1;
drop table t1|
drop procedure bug8850|