database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  mysql.com:/home/my/mysql-5.1


BUILD/SETUP.sh:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ndb_index_unique.test:
  Auto merged
mysql-test/t/rpl_row_create_table.test:
  Auto merged
mysql-test/t/rpl_sp.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/type_binary.test:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/rpl_sp.result:
  Manual merge
mysql-test/t/ndb_update.test:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
This commit is contained in:
unknown
2007-01-22 19:18:22 +02:00
parent 10f4f15e83 b4f80eedf3
commit a043cd152d
60 changed files with 283 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1493,10 +1493,10 @@ insert into t3 (a) values (1)|
create procedure h_ee()
deterministic
begin
declare continue handler for 1062 -- ER_DUP_ENTRY
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Outer (bad)' as 'h_ee';
begin
declare continue handler for 1062 -- ER_DUP_ENTRY
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Inner (good)' as 'h_ee';
insert into t3 values (1);
end;
@@ -1504,7 +1504,7 @@ end|
create procedure h_es()
deterministic
begin
declare continue handler for 1062 -- ER_DUP_ENTRY
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Outer (good)' as 'h_es';
begin
-- integrity constraint violation
@@ -1541,7 +1541,7 @@ end|
create procedure h_ex()
deterministic
begin
declare continue handler for 1062 -- ER_DUP_ENTRY
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Outer (good)' as 'h_ex';
begin
declare continue handler for sqlexception
@@ -1556,7 +1556,7 @@ begin
declare continue handler for sqlstate '23000'
select 'Outer (bad)' as 'h_se';
begin
declare continue handler for 1062 -- ER_DUP_ENTRY
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Inner (good)' as 'h_se';
insert into t3 values (1);
end;
@@ -1696,7 +1696,7 @@ begin
declare continue handler for sqlexception
select 'Outer (bad)' as 'h_xe';
begin
declare continue handler for 1062 -- ER_DUP_ENTRY
declare continue handler for 1579 -- ER_DUP_ENTRY_WITH_KEY_NAME
select 'Inner (good)' as 'h_xe';
insert into t3 values (1);
end;
@@ -4701,10 +4701,10 @@ insert into t3 values (1)|
create procedure bug15011()
deterministic
begin
declare continue handler for 1062
declare continue handler for 1579
select 'Outer' as 'Handler';
begin
declare continue handler for 1062
declare continue handler for 1579
select 'Inner' as 'Handler';
insert into t3 values (1);
end;