database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

After-merge fix: Adjust some results.

Browse Source
This commit is contained in:
Marko Mäkelä
2017-09-20 20:47:18 +03:00
parent fc3b1a7d2f
commit 625951cb28
14 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/commit_1innodb.result
View File

@ -230,7 +230,7 @@ insert into t2 (a) values (1023);
do (f2(23)); do (f2(23));
Warnings: Warnings:
Error 1062 Duplicate entry '23' for key 'a' Error 1062 Duplicate entry '23' for key 'a'
Note 4091 At line 4 in test.f2 Note 4092 At line 4 in test.f2
select * from t2; select * from t2;
a a
1023 1023

2
mysql-test/r/create_drop_binlog.result
View File

@ -160,7 +160,7 @@ Note 1050 Table 'v1' already exists
DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v1;
DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v1;
Warnings: Warnings:
Note 4089 Unknown VIEW: 'test.v1' Note 4090 Unknown VIEW: 'test.v1'
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info Log_name Pos Event_type Server_id End_log_pos Info
# # Format_desc 1 # VER # # Format_desc 1 # VER

2
mysql-test/r/create_drop_view.result
View File

@ -55,5 +55,5 @@ id
DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v1;
DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v1;
Warnings: Warnings:
Note 4089 Unknown VIEW: 'test.v1' Note 4090 Unknown VIEW: 'test.v1'
DROP TABLE t1; DROP TABLE t1;

8
mysql-test/r/drop.result
View File

@ -209,10 +209,10 @@ Note 1051 Unknown table 'test.table1'
Note 1051 Unknown table 'test.table2' Note 1051 Unknown table 'test.table2'
DROP VIEW IF EXISTS view1,view2,view3,view4; DROP VIEW IF EXISTS view1,view2,view3,view4;
Warnings: Warnings:
Note 4089 Unknown VIEW: 'test.view1' Note 4090 Unknown VIEW: 'test.view1'
Note 4089 Unknown VIEW: 'test.view2' Note 4090 Unknown VIEW: 'test.view2'
Note 4089 Unknown VIEW: 'test.view3' Note 4090 Unknown VIEW: 'test.view3'
Note 4089 Unknown VIEW: 'test.view4' Note 4090 Unknown VIEW: 'test.view4'
# Test error message when trigger does not find table # Test error message when trigger does not find table
CREATE TABLE table1(a int); CREATE TABLE table1(a int);

2
mysql-test/r/get_diagnostics.result
View File

@ -590,7 +590,7 @@ DROP PROCEDURE p1;
SHOW WARNINGS; SHOW WARNINGS;
Level Code Message Level Code Message
Error 54321 MESSAGE_TEXT text Error 54321 MESSAGE_TEXT text
Note 4091 At line 16 in test.p1 Note 4092 At line 16 in test.p1
CREATE PROCEDURE p1() CREATE PROCEDURE p1()
BEGIN BEGIN
DECLARE var INT; DECLARE var INT;

2
mysql-test/r/grant.result
View File

@ -1428,7 +1428,7 @@ Warnings:
Note 1305 FUNCTION test.test_function does not exist Note 1305 FUNCTION test.test_function does not exist
drop view if exists v1; drop view if exists v1;
Warnings: Warnings:
Note 4089 Unknown VIEW: 'test.v1' Note 4090 Unknown VIEW: 'test.v1'
create table test (col1 varchar(30)); create table test (col1 varchar(30));
create function test_function() returns varchar(30) create function test_function() returns varchar(30)
begin begin

2
mysql-test/r/profiling.result
View File

@ -415,7 +415,7 @@ select @@profiling;
drop table if exists t1, t2, t3; drop table if exists t1, t2, t3;
drop view if exists v1; drop view if exists v1;
Warnings: Warnings:
Note 4089 Unknown VIEW: 'test.v1' Note 4090 Unknown VIEW: 'test.v1'
drop function if exists f1; drop function if exists f1;
set session profiling = OFF; set session profiling = OFF;
set global profiling_history_size= @start_value; set global profiling_history_size= @start_value;

34
mysql-test/r/signal.result
View File

@ -1715,7 +1715,7 @@ show warnings $$
Level Code Message Level Code Message
Warning 1012 Raising a warning Warning 1012 Raising a warning
Error 5555 RESIGNAL to not found Error 5555 RESIGNAL to not found
Note 4091 At line 9 in test.test_resignal Note 4092 At line 9 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
create procedure test_resignal() create procedure test_resignal()
begin begin
@ -1740,7 +1740,7 @@ show warnings $$
Level Code Message Level Code Message
Warning 1012 Raising a warning Warning 1012 Raising a warning
Error 5555 RESIGNAL to error Error 5555 RESIGNAL to error
Note 4091 At line 9 in test.test_resignal Note 4092 At line 9 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
create procedure test_resignal() create procedure test_resignal()
begin begin
@ -1789,7 +1789,7 @@ show warnings $$
Level Code Message Level Code Message
Error 1012 Raising a not found Error 1012 Raising a not found
Error 5555 RESIGNAL to not found Error 5555 RESIGNAL to not found
Note 4091 At line 9 in test.test_resignal Note 4092 At line 9 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
create procedure test_resignal() create procedure test_resignal()
begin begin
@ -1814,7 +1814,7 @@ show warnings $$
Level Code Message Level Code Message
Error 1012 Raising a not found Error 1012 Raising a not found
Error 5555 RESIGNAL to error Error 5555 RESIGNAL to error
Note 4091 At line 9 in test.test_resignal Note 4092 At line 9 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
create procedure test_resignal() create procedure test_resignal()
begin begin
@ -1863,7 +1863,7 @@ show warnings $$
Level Code Message Level Code Message
Error 1012 Raising an error Error 1012 Raising an error
Error 5555 RESIGNAL to not found Error 5555 RESIGNAL to not found
Note 4091 At line 9 in test.test_resignal Note 4092 At line 9 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
create procedure test_resignal() create procedure test_resignal()
begin begin
@ -1888,7 +1888,7 @@ show warnings $$
Level Code Message Level Code Message
Error 1012 Raising an error Error 1012 Raising an error
Error 5555 RESIGNAL to error Error 5555 RESIGNAL to error
Note 4091 At line 9 in test.test_resignal Note 4092 At line 9 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
create procedure test_resignal() create procedure test_resignal()
begin begin
@ -1931,7 +1931,7 @@ show warnings $$
Level Code Message Level Code Message
Warning 1264 Out of range value for column 'a' at row 1 Warning 1264 Out of range value for column 'a' at row 1
Error 5555 RESIGNAL to a not found Error 5555 RESIGNAL to a not found
Note 4091 At line 8 in test.test_resignal Note 4092 At line 8 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
create procedure test_resignal() create procedure test_resignal()
begin begin
@ -1953,7 +1953,7 @@ show warnings $$
Level Code Message Level Code Message
Warning 1264 Out of range value for column 'a' at row 1 Warning 1264 Out of range value for column 'a' at row 1
Error 5555 RESIGNAL to an error Error 5555 RESIGNAL to an error
Note 4091 At line 8 in test.test_resignal Note 4092 At line 8 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
create procedure test_resignal() create procedure test_resignal()
begin begin
@ -2004,7 +2004,7 @@ show warnings $$
Level Code Message Level Code Message
Error 1329 No data - zero rows fetched, selected, or processed Error 1329 No data - zero rows fetched, selected, or processed
Error 5555 RESIGNAL to a not found Error 5555 RESIGNAL to a not found
Note 4091 At line 10 in test.test_resignal Note 4092 At line 10 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
create procedure test_resignal() create procedure test_resignal()
begin begin
@ -2030,7 +2030,7 @@ show warnings $$
Level Code Message Level Code Message
Error 1329 No data - zero rows fetched, selected, or processed Error 1329 No data - zero rows fetched, selected, or processed
Error 5555 RESIGNAL to an error Error 5555 RESIGNAL to an error
Note 4091 At line 10 in test.test_resignal Note 4092 At line 10 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
create procedure test_resignal() create procedure test_resignal()
begin begin
@ -2073,7 +2073,7 @@ show warnings $$
Level Code Message Level Code Message
Error 1051 Unknown table 'test.no_such_table' Error 1051 Unknown table 'test.no_such_table'
Error 5555 RESIGNAL to a not found Error 5555 RESIGNAL to a not found
Note 4091 At line 8 in test.test_resignal Note 4092 At line 8 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
create procedure test_resignal() create procedure test_resignal()
begin begin
@ -2095,7 +2095,7 @@ show warnings $$
Level Code Message Level Code Message
Error 1051 Unknown table 'test.no_such_table' Error 1051 Unknown table 'test.no_such_table'
Error 5555 RESIGNAL to an error Error 5555 RESIGNAL to an error
Note 4091 At line 8 in test.test_resignal Note 4092 At line 8 in test.test_resignal
drop procedure test_resignal $$ drop procedure test_resignal $$
# #
# More complex cases # More complex cases
@ -2142,7 +2142,7 @@ ERROR 42000: Hi, I am a useless error message
show warnings $$ show warnings $$
Level Code Message Level Code Message
Error 9999 Hi, I am a useless error message Error 9999 Hi, I am a useless error message
Note 4091 At line 7 in test.peter_p2 Note 4092 At line 7 in test.peter_p2
drop procedure peter_p1 $$ drop procedure peter_p1 $$
drop procedure peter_p2 $$ drop procedure peter_p2 $$
CREATE PROCEDURE peter_p1 () CREATE PROCEDURE peter_p1 ()
@ -2198,16 +2198,16 @@ Level Code Message
Error 1231 Variable 'sql_mode' can't be set to the value of 'NULL' Error 1231 Variable 'sql_mode' can't be set to the value of 'NULL'
Error 1232 Variable 'sql_mode' can't be set to the value of 'NULL' Error 1232 Variable 'sql_mode' can't be set to the value of 'NULL'
Error 9999 Variable 'sql_mode' can't be set to the value of 'NULL' Error 9999 Variable 'sql_mode' can't be set to the value of 'NULL'
Note 4091 At line 8 in test.peter_p1 Note 4092 At line 8 in test.peter_p1
ERROR 42000: Hi, I am a useless error message ERROR 42000: Hi, I am a useless error message
show warnings $$ show warnings $$
Level Code Message Level Code Message
Error 1231 Variable 'sql_mode' can't be set to the value of 'NULL' Error 1231 Variable 'sql_mode' can't be set to the value of 'NULL'
Error 1232 Variable 'sql_mode' can't be set to the value of 'NULL' Error 1232 Variable 'sql_mode' can't be set to the value of 'NULL'
Error 9999 Variable 'sql_mode' can't be set to the value of 'NULL' Error 9999 Variable 'sql_mode' can't be set to the value of 'NULL'
Note 4091 At line 8 in test.peter_p1 Note 4092 At line 8 in test.peter_p1
Error 9999 Hi, I am a useless error message Error 9999 Hi, I am a useless error message
Note 4091 At line 10 in test.peter_p2 Note 4092 At line 10 in test.peter_p2
drop procedure peter_p1 $$ drop procedure peter_p1 $$
drop procedure peter_p2 $$ drop procedure peter_p2 $$
drop procedure if exists peter_p3 $$ drop procedure if exists peter_p3 $$
@ -2225,7 +2225,7 @@ show warnings $$
Level Code Message Level Code Message
Error 1 Original Error 1 Original
Error 2 Original Error 2 Original
Note 4091 At line 4 in test.peter_p3 Note 4092 At line 4 in test.peter_p3
drop procedure peter_p3 $$ drop procedure peter_p3 $$
drop table t_warn; drop table t_warn;
drop table t_cursor; drop table t_cursor;

42
mysql-test/r/signal_demo3.result
View File

@ -79,23 +79,23 @@ show warnings;
Level Code Message Level Code Message
Error 1051 Unknown table 'demo.oops_it_is_not_here' Error 1051 Unknown table 'demo.oops_it_is_not_here'
Error 1644 Oops in proc_9 Error 1644 Oops in proc_9
Note 4091 At line 4 in demo.proc_9 Note 4092 At line 4 in demo.proc_9
Error 1644 Oops in proc_8 Error 1644 Oops in proc_8
Note 4091 At line 4 in demo.proc_8 Note 4092 At line 4 in demo.proc_8
Error 1644 Oops in proc_7 Error 1644 Oops in proc_7
Note 4091 At line 4 in demo.proc_7 Note 4092 At line 4 in demo.proc_7
Error 1644 Oops in proc_6 Error 1644 Oops in proc_6
Note 4091 At line 4 in demo.proc_6 Note 4092 At line 4 in demo.proc_6
Error 1644 Oops in proc_5 Error 1644 Oops in proc_5
Note 4091 At line 4 in demo.proc_5 Note 4092 At line 4 in demo.proc_5
Error 1644 Oops in proc_4 Error 1644 Oops in proc_4
Note 4091 At line 4 in demo.proc_4 Note 4092 At line 4 in demo.proc_4
Error 1644 Oops in proc_3 Error 1644 Oops in proc_3
Note 4091 At line 4 in demo.proc_3 Note 4092 At line 4 in demo.proc_3
Error 1644 Oops in proc_2 Error 1644 Oops in proc_2
Note 4091 At line 4 in demo.proc_2 Note 4092 At line 4 in demo.proc_2
Error 1644 Oops in proc_1 Error 1644 Oops in proc_1
Note 4091 At line 4 in demo.proc_1 Note 4092 At line 4 in demo.proc_1
SET @@session.max_error_count = 5; SET @@session.max_error_count = 5;
SELECT @@session.max_error_count; SELECT @@session.max_error_count;
@@session.max_error_count @@session.max_error_count
@ -104,11 +104,11 @@ call proc_1();
ERROR 45000: Oops in proc_1 ERROR 45000: Oops in proc_1
show warnings; show warnings;
Level Code Message Level Code Message
Note 4091 At line 4 in demo.proc_3 Note 4092 At line 4 in demo.proc_3
Error 1644 Oops in proc_2 Error 1644 Oops in proc_2
Note 4091 At line 4 in demo.proc_2 Note 4092 At line 4 in demo.proc_2
Error 1644 Oops in proc_1 Error 1644 Oops in proc_1
Note 4091 At line 4 in demo.proc_1 Note 4092 At line 4 in demo.proc_1
SET @@session.max_error_count = 7; SET @@session.max_error_count = 7;
SELECT @@session.max_error_count; SELECT @@session.max_error_count;
@@session.max_error_count @@session.max_error_count
@ -117,13 +117,13 @@ call proc_1();
ERROR 45000: Oops in proc_1 ERROR 45000: Oops in proc_1
show warnings; show warnings;
Level Code Message Level Code Message
Note 4091 At line 4 in demo.proc_4 Note 4092 At line 4 in demo.proc_4
Error 1644 Oops in proc_3 Error 1644 Oops in proc_3
Note 4091 At line 4 in demo.proc_3 Note 4092 At line 4 in demo.proc_3
Error 1644 Oops in proc_2 Error 1644 Oops in proc_2
Note 4091 At line 4 in demo.proc_2 Note 4092 At line 4 in demo.proc_2
Error 1644 Oops in proc_1 Error 1644 Oops in proc_1
Note 4091 At line 4 in demo.proc_1 Note 4092 At line 4 in demo.proc_1
SET @@session.max_error_count = 9; SET @@session.max_error_count = 9;
SELECT @@session.max_error_count; SELECT @@session.max_error_count;
@@session.max_error_count @@session.max_error_count
@ -132,15 +132,15 @@ call proc_1();
ERROR 45000: Oops in proc_1 ERROR 45000: Oops in proc_1
show warnings; show warnings;
Level Code Message Level Code Message
Note 4091 At line 4 in demo.proc_5 Note 4092 At line 4 in demo.proc_5
Error 1644 Oops in proc_4 Error 1644 Oops in proc_4
Note 4091 At line 4 in demo.proc_4 Note 4092 At line 4 in demo.proc_4
Error 1644 Oops in proc_3 Error 1644 Oops in proc_3
Note 4091 At line 4 in demo.proc_3 Note 4092 At line 4 in demo.proc_3
Error 1644 Oops in proc_2 Error 1644 Oops in proc_2
Note 4091 At line 4 in demo.proc_2 Note 4092 At line 4 in demo.proc_2
Error 1644 Oops in proc_1 Error 1644 Oops in proc_1
Note 4091 At line 4 in demo.proc_1 Note 4092 At line 4 in demo.proc_1
drop database demo; drop database demo;
SET @@global.max_error_count = @start_global_value; SET @@global.max_error_count = @start_global_value;
SELECT @@global.max_error_count; SELECT @@global.max_error_count;

4
mysql-test/r/sp-error.result
View File

@ -1990,8 +1990,8 @@ Warning 1264 Out of range value for column 'a' at row 1
Note 1292 Truncated incorrect INTEGER value: '222222 ' Note 1292 Truncated incorrect INTEGER value: '222222 '
Warning 1264 Out of range value for column 'b' at row 1 Warning 1264 Out of range value for column 'b' at row 1
Error 1048 Column 'c' cannot be null Error 1048 Column 'c' cannot be null
Note 4091 At line 6 in test.t1_bi Note 4092 At line 6 in test.t1_bi
Note 4091 At line 2 in test.p1 Note 4092 At line 2 in test.p1
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;

2
mysql-test/r/sp-group.result
View File

@ -3,7 +3,7 @@ Warnings:
Note 1051 Unknown table 'test.t1' Note 1051 Unknown table 'test.t1'
drop view if exists view_t1; drop view if exists view_t1;
Warnings: Warnings:
Note 4089 Unknown VIEW: 'test.view_t1' Note 4090 Unknown VIEW: 'test.view_t1'
SET sql_mode=ONLY_FULL_GROUP_BY; SET sql_mode=ONLY_FULL_GROUP_BY;
CREATE TABLE t1 ( CREATE TABLE t1 (
pk INT, pk INT,

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

@ -3211,7 +3211,7 @@ drop procedure bug10961|
DROP PROCEDURE IF EXISTS bug6866| DROP PROCEDURE IF EXISTS bug6866|
DROP VIEW IF EXISTS tv| DROP VIEW IF EXISTS tv|
Warnings: Warnings:
Note 4089 Unknown VIEW: 'test.tv' Note 4090 Unknown VIEW: 'test.tv'
DROP TABLE IF EXISTS tt1,tt2,tt3| DROP TABLE IF EXISTS tt1,tt2,tt3|
Warnings: Warnings:
Note 1051 Unknown table 'test.tt1' Note 1051 Unknown table 'test.tt1'
@ -7823,7 +7823,7 @@ ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
show warnings; show warnings;
Level Code Message Level Code Message
Error 1062 Duplicate entry '2' for key 'PRIMARY' Error 1062 Duplicate entry '2' for key 'PRIMARY'
Note 4091 At line 5 in test.p1 Note 4092 At line 5 in test.p1
select * from t1; select * from t1;
id id
1 1

2
mysql-test/r/view.result
View File

@ -5236,7 +5236,7 @@ CREATE TABLE t4 (i4 INT);
INSERT INTO t4 VALUES (1),(2); INSERT INTO t4 VALUES (1),(2);
DROP VIEW IF EXISTS v1; DROP VIEW IF EXISTS v1;
Warnings: Warnings:
Note 4089 Unknown VIEW: 'test.v1' Note 4090 Unknown VIEW: 'test.v1'
CREATE VIEW v1 AS select coalesce(j1,i3) AS v1_field1 from t2 join t3 left join t1 on ( i1 = i2 ); CREATE VIEW v1 AS select coalesce(j1,i3) AS v1_field1 from t2 join t3 left join t1 on ( i1 = i2 );
CREATE VIEW v2 AS select v1_field1 from t4 join v1; CREATE VIEW v2 AS select v1_field1 from t4 join v1;
prepare my_stmt from "select v1_field1 from v2"; prepare my_stmt from "select v1_field1 from v2";

2
mysql-test/r/warnings.result
View File

@ -353,7 +353,7 @@ ERROR 23000: Duplicate entry '11' for key 'a'
SHOW WARNINGS; SHOW WARNINGS;
Level Code Message Level Code Message
Note 4091 At line 4 in test.f1 Note 4092 At line 4 in test.f1
Error 1062 Duplicate entry '11' for key 'a' Error 1062 Duplicate entry '11' for key 'a'
DROP TABLE t1; DROP TABLE t1;