Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
686c8eb0
Commit
686c8eb0
authored
Mar 09, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents
3d37ec6b
96a9857b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
239 additions
and
157 deletions
+239
-157
mysql-test/r/sp.result
mysql-test/r/sp.result
+0
-71
mysql-test/r/sp_trans.result
mysql-test/r/sp_trans.result
+105
-0
mysql-test/t/sp.test
mysql-test/t/sp.test
+0
-86
mysql-test/t/sp_trans.test
mysql-test/t/sp_trans.test
+134
-0
No files found.
mysql-test/r/sp.result
View file @
686c8eb0
...
@@ -2197,35 +2197,6 @@ select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
...
@@ -2197,35 +2197,6 @@ select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
2 01-01-1970 03:16:40
2 01-01-1970 03:16:40
drop procedure bug3426|
drop procedure bug3426|
create table t3 (
create table t3 (
a int primary key,
ach char(1)
) engine = innodb|
create table t4 (
b int primary key ,
bch char(1)
) engine = innodb|
insert into t3 values (1 , 'aCh1' ) , ('2' , 'aCh2')|
Warnings:
Warning 1265 Data truncated for column 'ach' at row 1
Warning 1265 Data truncated for column 'ach' at row 2
insert into t4 values (1 , 'bCh1' )|
Warnings:
Warning 1265 Data truncated for column 'bch' at row 1
drop procedure if exists bug3448|
create procedure bug3448()
select * from t3 inner join t4 on t3.a = t4.b|
select * from t3 inner join t4 on t3.a = t4.b|
a ach b bch
1 a 1 b
call bug3448()|
a ach b bch
1 a 1 b
call bug3448()|
a ach b bch
1 a 1 b
drop procedure bug3448|
drop table t3, t4|
create table t3 (
id int unsigned auto_increment not null primary key,
id int unsigned auto_increment not null primary key,
title VARCHAR(200),
title VARCHAR(200),
body text,
body text,
...
@@ -4005,48 +3976,6 @@ DROP VIEW bug13095_v1
...
@@ -4005,48 +3976,6 @@ DROP VIEW bug13095_v1
DROP PROCEDURE IF EXISTS bug13095;
DROP PROCEDURE IF EXISTS bug13095;
DROP VIEW IF EXISTS bug13095_v1;
DROP VIEW IF EXISTS bug13095_v1;
DROP TABLE IF EXISTS bug13095_t1;
DROP TABLE IF EXISTS bug13095_t1;
drop procedure if exists bug14210|
set @@session.max_heap_table_size=16384|
select @@session.max_heap_table_size|
@@session.max_heap_table_size
16384
create table t3 (a char(255)) engine=InnoDB|
create procedure bug14210_fill_table()
begin
declare table_size, max_table_size int default 0;
select @@session.max_heap_table_size into max_table_size;
delete from t3;
insert into t3 (a) values (repeat('a', 255));
repeat
insert into t3 select a from t3;
select count(*)*255 from t3 into table_size;
until table_size > max_table_size*2 end repeat;
end|
call bug14210_fill_table()|
drop procedure bug14210_fill_table|
create table t4 like t3|
create procedure bug14210()
begin
declare a char(255);
declare done int default 0;
declare c cursor for select * from t3;
declare continue handler for sqlstate '02000' set done = 1;
open c;
repeat
fetch c into a;
if not done then
insert into t4 values (upper(a));
end if;
until done end repeat;
close c;
end|
call bug14210()|
select count(*) from t4|
count(*)
256
drop table t3, t4|
drop procedure bug14210|
set @@session.max_heap_table_size=default|
drop function if exists bug14723|
drop function if exists bug14723|
drop procedure if exists bug14723|
drop procedure if exists bug14723|
/*!50003 create function bug14723()
/*!50003 create function bug14723()
...
...
mysql-test/r/sp_trans.result
View file @
686c8eb0
...
@@ -425,3 +425,108 @@ x y
...
@@ -425,3 +425,108 @@ x y
drop procedure bug14840_1|
drop procedure bug14840_1|
drop procedure bug14840_2|
drop procedure bug14840_2|
drop table t3|
drop table t3|
drop procedure if exists bug10656_create_index|
drop procedure if exists bug10656_myjoin|
drop procedure if exists bug10656_truncate_table|
CREATE TABLE t3 (
`ID` int(11) default NULL,
`txt` char(5) default NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1|
INSERT INTO t3 (`ID`,`txt`) VALUES
(1,'a'), (2,'b'), (3,'c'), (4,'d')|
CREATE TABLE t4 (
`ID` int(11) default NULL,
`txt` char(5) default NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1|
INSERT INTO t4 (`ID`,`txt`) VALUES
(1,'a'), (2,'b'), (3,'c'), (4,'d')|
create procedure bug10656_create_index()
begin
create index bug10656_my_index on t3 (ID);
end|
call bug10656_create_index()|
create procedure bug10656_myjoin()
begin
update t3, t4 set t3.txt = t4.txt where t3.id = t4.id;
end|
call bug10656_myjoin()|
create procedure bug10656_truncate_table()
begin
truncate table t3;
end|
call bug10656_truncate_table()|
drop procedure bug10656_create_index|
drop procedure bug10656_myjoin|
drop procedure bug10656_truncate_table|
drop table t3, t4|
create table t3 (
a int primary key,
ach char(1)
) engine = innodb|
create table t4 (
b int primary key,
bch char(1)
) engine = innodb|
insert into t3 values (1 , 'aCh1' ) , ('2' , 'aCh2')|
Warnings:
Warning 1265 Data truncated for column 'ach' at row 1
Warning 1265 Data truncated for column 'ach' at row 2
insert into t4 values (1 , 'bCh1' )|
Warnings:
Warning 1265 Data truncated for column 'bch' at row 1
drop procedure if exists bug3448|
create procedure bug3448()
select * from t3 inner join t4 on t3.a = t4.b|
select * from t3 inner join t4 on t3.a = t4.b|
a ach b bch
1 a 1 b
call bug3448()|
a ach b bch
1 a 1 b
call bug3448()|
a ach b bch
1 a 1 b
drop procedure bug3448|
drop table t3, t4|
drop procedure if exists bug14210|
set @@session.max_heap_table_size=16384|
select @@session.max_heap_table_size|
@@session.max_heap_table_size
16384
create table t3 (a char(255)) engine=InnoDB|
create procedure bug14210_fill_table()
begin
declare table_size, max_table_size int default 0;
select @@session.max_heap_table_size into max_table_size;
delete from t3;
insert into t3 (a) values (repeat('a', 255));
repeat
insert into t3 select a from t3;
select count(*)*255 from t3 into table_size;
until table_size > max_table_size*2 end repeat;
end|
call bug14210_fill_table()|
drop procedure bug14210_fill_table|
create table t4 like t3|
create procedure bug14210()
begin
declare a char(255);
declare done int default 0;
declare c cursor for select * from t3;
declare continue handler for sqlstate '02000' set done = 1;
open c;
repeat
fetch c into a;
if not done then
insert into t4 values (upper(a));
end if;
until done end repeat;
close c;
end|
call bug14210()|
select count(*) from t4|
count(*)
256
drop table t3, t4|
drop procedure bug14210|
set @@session.max_heap_table_size=default|
mysql-test/t/sp.test
View file @
686c8eb0
...
@@ -2602,38 +2602,6 @@ select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
...
@@ -2602,38 +2602,6 @@ select @i, from_unixtime(@stamped_time, '%d-%m-%Y %h:%i:%s') as time|
drop procedure bug3426|
drop procedure bug3426|
#
# BUG#3448
#
--disable_warnings
create table t3 (
a int primary key,
ach char(1)
) engine = innodb|
create table t4 (
b int primary key ,
bch char(1)
) engine = innodb|
--enable_warnings
insert into t3 values (1 , 'aCh1' ) , ('2' , 'aCh2')|
insert into t4 values (1 , 'bCh1' )|
--disable_warnings
drop procedure if exists bug3448|
--enable_warnings
create procedure bug3448()
select * from t3 inner join t4 on t3.a = t4.b|
select * from t3 inner join t4 on t3.a = t4.b|
call bug3448()|
call bug3448()|
drop procedure bug3448|
drop table t3, t4|
#
#
# BUG#3734
# BUG#3734
#
#
...
@@ -4853,60 +4821,6 @@ DROP TABLE IF EXISTS bug13095_t1;
...
@@ -4853,60 +4821,6 @@ DROP TABLE IF EXISTS bug13095_t1;
delimiter |;
delimiter |;
#
# BUG#14210: "Simple query with > operator on large table gives server
# crash"
# Check that cursors work in case when HEAP tables are converted to
# MyISAM
#
--disable_warnings
drop procedure if exists bug14210|
--enable_warnings
set @@session.max_heap_table_size=16384|
select @@session.max_heap_table_size|
# To trigger the memory corruption the original table must be InnoDB.
# No harm if it's not, so don't warn if the suite is run with --skip-innodb
--disable_warnings
create table t3 (a char(255)) engine=InnoDB|
--enable_warnings
create procedure bug14210_fill_table()
begin
declare table_size, max_table_size int default 0;
select @@session.max_heap_table_size into max_table_size;
delete from t3;
insert into t3 (a) values (repeat('a', 255));
repeat
insert into t3 select a from t3;
select count(*)*255 from t3 into table_size;
until table_size > max_table_size*2 end repeat;
end|
call bug14210_fill_table()|
drop procedure bug14210_fill_table|
create table t4 like t3|
create procedure bug14210()
begin
declare a char(255);
declare done int default 0;
declare c cursor for select * from t3;
declare continue handler for sqlstate '02000' set done = 1;
open c;
repeat
fetch c into a;
if not done then
insert into t4 values (upper(a));
end if;
until done end repeat;
close c;
end|
call bug14210()|
select count(*) from t4|
drop table t3, t4|
drop procedure bug14210|
set @@session.max_heap_table_size=default|
#
#
# BUG#1473: Dumping of stored functions seems to cause corruption in
# BUG#1473: Dumping of stored functions seems to cause corruption in
# the function body
# the function body
...
...
mysql-test/t/sp_trans.test
View file @
686c8eb0
...
@@ -419,6 +419,140 @@ drop procedure bug14840_2|
...
@@ -419,6 +419,140 @@ drop procedure bug14840_2|
drop
table
t3
|
drop
table
t3
|
#
# BUG#10656: Stored Procedure - Create index and Truncate table command error
#
--
disable_warnings
drop
procedure
if
exists
bug10656_create_index
|
drop
procedure
if
exists
bug10656_myjoin
|
drop
procedure
if
exists
bug10656_truncate_table
|
--
enable_warnings
CREATE
TABLE
t3
(
`ID`
int
(
11
)
default
NULL
,
`txt`
char
(
5
)
default
NULL
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
latin1
|
INSERT
INTO
t3
(
`ID`
,
`txt`
)
VALUES
(
1
,
'a'
),
(
2
,
'b'
),
(
3
,
'c'
),
(
4
,
'd'
)
|
CREATE
TABLE
t4
(
`ID`
int
(
11
)
default
NULL
,
`txt`
char
(
5
)
default
NULL
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
latin1
|
INSERT
INTO
t4
(
`ID`
,
`txt`
)
VALUES
(
1
,
'a'
),
(
2
,
'b'
),
(
3
,
'c'
),
(
4
,
'd'
)
|
create
procedure
bug10656_create_index
()
begin
create
index
bug10656_my_index
on
t3
(
ID
);
end
|
call
bug10656_create_index
()
|
create
procedure
bug10656_myjoin
()
begin
update
t3
,
t4
set
t3
.
txt
=
t4
.
txt
where
t3
.
id
=
t4
.
id
;
end
|
call
bug10656_myjoin
()
|
create
procedure
bug10656_truncate_table
()
begin
truncate
table
t3
;
end
|
call
bug10656_truncate_table
()
|
drop
procedure
bug10656_create_index
|
drop
procedure
bug10656_myjoin
|
drop
procedure
bug10656_truncate_table
|
drop
table
t3
,
t4
|
#
# BUG#3448
#
--
disable_warnings
create
table
t3
(
a
int
primary
key
,
ach
char
(
1
)
)
engine
=
innodb
|
create
table
t4
(
b
int
primary
key
,
bch
char
(
1
)
)
engine
=
innodb
|
--
enable_warnings
insert
into
t3
values
(
1
,
'aCh1'
)
,
(
'2'
,
'aCh2'
)
|
insert
into
t4
values
(
1
,
'bCh1'
)
|
--
disable_warnings
drop
procedure
if
exists
bug3448
|
--
enable_warnings
create
procedure
bug3448
()
select
*
from
t3
inner
join
t4
on
t3
.
a
=
t4
.
b
|
select
*
from
t3
inner
join
t4
on
t3
.
a
=
t4
.
b
|
call
bug3448
()
|
call
bug3448
()
|
drop
procedure
bug3448
|
drop
table
t3
,
t4
|
#
# BUG#14210: "Simple query with > operator on large table gives server
# crash"
# Check that cursors work in case when HEAP tables are converted to
# MyISAM
#
--
disable_warnings
drop
procedure
if
exists
bug14210
|
--
enable_warnings
set
@@
session
.
max_heap_table_size
=
16384
|
select
@@
session
.
max_heap_table_size
|
# To trigger the memory corruption the original table must be InnoDB.
# No harm if it's not, so don't warn if the suite is run with --skip-innodb
--
disable_warnings
create
table
t3
(
a
char
(
255
))
engine
=
InnoDB
|
--
enable_warnings
create
procedure
bug14210_fill_table
()
begin
declare
table_size
,
max_table_size
int
default
0
;
select
@@
session
.
max_heap_table_size
into
max_table_size
;
delete
from
t3
;
insert
into
t3
(
a
)
values
(
repeat
(
'a'
,
255
));
repeat
insert
into
t3
select
a
from
t3
;
select
count
(
*
)
*
255
from
t3
into
table_size
;
until
table_size
>
max_table_size
*
2
end
repeat
;
end
|
call
bug14210_fill_table
()
|
drop
procedure
bug14210_fill_table
|
create
table
t4
like
t3
|
create
procedure
bug14210
()
begin
declare
a
char
(
255
);
declare
done
int
default
0
;
declare
c
cursor
for
select
*
from
t3
;
declare
continue
handler
for
sqlstate
'02000'
set
done
=
1
;
open
c
;
repeat
fetch
c
into
a
;
if
not
done
then
insert
into
t4
values
(
upper
(
a
));
end
if
;
until
done
end
repeat
;
close
c
;
end
|
call
bug14210
()
|
select
count
(
*
)
from
t4
|
drop
table
t3
,
t4
|
drop
procedure
bug14210
|
set
@@
session
.
max_heap_table_size
=
default
|
#
#
# BUG#NNNN: New bug synopsis
# BUG#NNNN: New bug synopsis
#
#
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment