database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Remove end . from error messages to get them consistent

Browse Source 
Fixed a few failing tests
This commit is contained in:
Monty
2016-10-03 18:49:44 +03:00
parent c1125c3218
commit af7490f95d
193 changed files with 2272 additions and 2267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
mysql-test/suite/funcs_1/r/innodb_func_view.result
View File

@ -916,8 +916,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 1.7976931348623e308 3
0 4
-1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_double`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -931,8 +931,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 1.7976931348623e308 3
0 4
-1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
DROP VIEW v1;
@ -946,8 +946,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 9999999999999999999999999999999999.999999999999
0.000000000000000000000000000000 4
-1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -961,8 +961,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 9999999999999999999999999999999999.999999999999
0.000000000000000000000000000000 4
-1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
DROP VIEW v1;
@ -2586,9 +2586,9 @@ NULL NULL 1
0 0 4
18446744073709551615 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
@ -2603,9 +2603,9 @@ NULL NULL 1
0 0 4
18446744073709551615 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
DROP VIEW v1;
@ -2622,9 +2622,9 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
0 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -2638,9 +2638,9 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
0 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated
DROP VIEW v1;
@ -2964,8 +2964,8 @@ NULL NULL 1
0 0 4
-1 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -2979,8 +2979,8 @@ NULL NULL 1
0 0 4
-1 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
DROP VIEW v1;
@ -2996,8 +2996,8 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
-1 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -3011,8 +3011,8 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
-1 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
DROP VIEW v1;
@ -3323,9 +3323,9 @@ NULL NULL 1
-1.00 -1 5
-3333.33 -3333.3333 30
Warnings:
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
@ -3341,9 +3341,9 @@ NULL NULL 1
-1.00 -1 5
-3333.33 -3333.3333 30
Warnings:
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
DROP VIEW v1;

4
mysql-test/suite/funcs_1/r/innodb_trig_08.result
View File

@ -525,14 +525,14 @@ Start transaction;
Set new.f120='U';
Commit;
END//
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
Create trigger trg9_2 before delete on tb3 for each row
BEGIN
Start transaction;
Set @var2=old.f120;
Rollback;
END//
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
connection default;
drop user test_general@localhost;
drop user test_general;

4
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result
View File

@ -269,7 +269,7 @@ for each row insert into t4 (f4) values (new.f3+1);
create trigger tr4 after insert on t4
for each row insert into t1 (f1) values (new.f4+1);
insert into t1 values (1);
ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
select * from t1 order by f1;
f1
0
@ -334,7 +334,7 @@ select @counter;
@counter
0
call trig_sp();
ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
select @counter;
@counter
2

2
mysql-test/suite/funcs_1/r/is_table_privileges.result
View File

@ -233,7 +233,7 @@ test t1_table
test t1_view
RENAME TABLE test.t1_table TO db_datadict.t1_table;
RENAME TABLE test.t1_view TO db_datadict.t1_view;
ERROR HY000: Changing schema from 'test' to 'db_datadict' is not allowed.
ERROR HY000: Changing schema from 'test' to 'db_datadict' is not allowed
SELECT DISTINCT table_schema,table_name FROM information_schema.table_privileges
WHERE table_name LIKE 't1_%'
ORDER BY table_schema,table_name;

2
mysql-test/suite/funcs_1/r/is_views.result
View File

@ -163,7 +163,7 @@ ORDER BY table_schema,table_name;
table_schema table_name
test t1_view
RENAME TABLE test.t1_view TO db_datadict.t1_view;
ERROR HY000: Changing schema from 'test' to 'db_datadict' is not allowed.
ERROR HY000: Changing schema from 'test' to 'db_datadict' is not allowed
DROP VIEW test.t1_view;
CREATE VIEW db_datadict.t1_view AS SELECT * FROM test.t1_table;
SELECT table_schema,table_name FROM information_schema.views

60
mysql-test/suite/funcs_1/r/memory_func_view.result
View File

@ -917,8 +917,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 1.7976931348623e308 3
0 4
-1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_double`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -932,8 +932,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 1.7976931348623e308 3
0 4
-1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
DROP VIEW v1;
@ -947,8 +947,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 9999999999999999999999999999999999.999999999999
0.000000000000000000000000000000 4
-1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -962,8 +962,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 9999999999999999999999999999999999.999999999999
0.000000000000000000000000000000 4
-1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
DROP VIEW v1;
@ -2587,9 +2587,9 @@ NULL NULL 1
0 0 4
18446744073709551615 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
@ -2604,9 +2604,9 @@ NULL NULL 1
0 0 4
18446744073709551615 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
DROP VIEW v1;
@ -2623,9 +2623,9 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
0 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -2639,9 +2639,9 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
0 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated
DROP VIEW v1;
@ -2965,8 +2965,8 @@ NULL NULL 1
0 0 4
-1 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -2980,8 +2980,8 @@ NULL NULL 1
0 0 4
-1 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
DROP VIEW v1;
@ -2997,8 +2997,8 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
-1 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -3012,8 +3012,8 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
-1 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
DROP VIEW v1;
@ -3324,9 +3324,9 @@ NULL NULL 1
-1.00 -1 5
-3333.33 -3333.3333 30
Warnings:
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
@ -3342,9 +3342,9 @@ NULL NULL 1
-1.00 -1 5
-3333.33 -3333.3333 30
Warnings:
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
DROP VIEW v1;

4
mysql-test/suite/funcs_1/r/memory_trig_08.result
View File

@ -525,14 +525,14 @@ Start transaction;
Set new.f120='U';
Commit;
END//
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
Create trigger trg9_2 before delete on tb3 for each row
BEGIN
Start transaction;
Set @var2=old.f120;
Rollback;
END//
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
connection default;
drop user test_general@localhost;
drop user test_general;

4
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result
View File

@ -270,7 +270,7 @@ for each row insert into t4 (f4) values (new.f3+1);
create trigger tr4 after insert on t4
for each row insert into t1 (f1) values (new.f4+1);
insert into t1 values (1);
ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
select * from t1 order by f1;
f1
0
@ -339,7 +339,7 @@ select @counter;
@counter
0
call trig_sp();
ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
select @counter;
@counter
2

60
mysql-test/suite/funcs_1/r/myisam_func_view.result
View File

@ -917,8 +917,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 1.7976931348623e308 3
0 4
-1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_double`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -932,8 +932,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 1.7976931348623e308 3
0 4
-1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
DROP VIEW v1;
@ -947,8 +947,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 9999999999999999999999999999999999.999999999999
0.000000000000000000000000000000 4
-1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_decimal`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_decimal)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -962,8 +962,8 @@ AaBbCcDdEeFfGgHhIiJjÄäÜüÖö 9999999999999999999999999999999999.999999999999
0.000000000000000000000000000000 4
-1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
DROP VIEW v1;
@ -2587,9 +2587,9 @@ NULL NULL 1
0 0 4
18446744073709551615 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
@ -2604,9 +2604,9 @@ NULL NULL 1
0 0 4
18446744073709551615 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
Note 1105 Cast to unsigned converted negative integer to it's positive complement
DROP VIEW v1;
@ -2623,9 +2623,9 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
0 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as unsigned) AS `CAST(my_decimal AS UNSIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -2639,9 +2639,9 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
0 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to UNSIGNED INT. Value truncated
Warning 1916 Got overflow when converting '-1.000000000000000000000000000000' to UNSIGNED INT. Value truncated
DROP VIEW v1;
@ -2965,8 +2965,8 @@ NULL NULL 1
0 0 4
-1 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -2980,8 +2980,8 @@ NULL NULL 1
0 0 4
-1 -1 5
Warnings:
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated.
Warning 1916 Got overflow when converting '-1.7976931348623e308' to INT. Value truncated
Warning 1916 Got overflow when converting '1.7976931348623e308' to INT. Value truncated
DROP VIEW v1;
@ -2997,8 +2997,8 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
-1 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_decimal` as signed) AS `CAST(my_decimal AS SIGNED INTEGER)`,`t1_values`.`my_decimal` AS `my_decimal`,`t1_values`.`id` AS `id` from `t1_values` latin1 latin1_swedish_ci
@ -3012,8 +3012,8 @@ NULL NULL 1
0 0.000000000000000000000000000000 4
-1 -1.000000000000000000000000000000 5
Warnings:
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated.
Warning 1916 Got overflow when converting '-9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
Warning 1916 Got overflow when converting '9999999999999999999999999999999999.999999999999999999999999999999' to INT. Value truncated
DROP VIEW v1;
@ -3324,9 +3324,9 @@ NULL NULL 1
-1.00 -1 5
-3333.33 -3333.3333 30
Warnings:
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
SHOW CREATE VIEW v1;
View Create View character_set_client collation_connection
@ -3342,9 +3342,9 @@ NULL NULL 1
-1.00 -1 5
-3333.33 -3333.3333 30
Warnings:
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated.
Warning 1916 Got overflow when converting '' to DECIMAL. Value truncated
Warning 1264 Out of range value for column 'CAST(my_double AS DECIMAL(37,2))' at row 1
DROP VIEW v1;

4
mysql-test/suite/funcs_1/r/myisam_trig_08.result
View File

@ -525,14 +525,14 @@ Start transaction;
Set new.f120='U';
Commit;
END//
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
Create trigger trg9_2 before delete on tb3 for each row
BEGIN
Start transaction;
Set @var2=old.f120;
Rollback;
END//
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
connection default;
drop user test_general@localhost;
drop user test_general;

4
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result
View File

@ -270,7 +270,7 @@ for each row insert into t4 (f4) values (new.f3+1);
create trigger tr4 after insert on t4
for each row insert into t1 (f1) values (new.f4+1);
insert into t1 values (1);
ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
select * from t1 order by f1;
f1
0
@ -339,7 +339,7 @@ select @counter;
@counter
0
call trig_sp();
ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
select @counter;
@counter
2

16
mysql-test/suite/funcs_1/r/storedproc.result
View File

@ -143,7 +143,7 @@ BEGIN
SET @v1 = f1;
SELECT @v1;
END//
ERROR 42000: Too big precision 256 specified for 'f1'. Maximum is 65.
ERROR 42000: Too big precision 256 specified for 'f1'. Maximum is 65
DROP PROCEDURE IF EXISTS sp1//
Warnings:
Note 1305 PROCEDURE db_storedproc.sp1 does not exist
@ -153,7 +153,7 @@ BEGIN
SET @v1 = f1;
SELECT @v1;
END//
ERROR 42000: Too big precision 66 specified for 'f1'. Maximum is 65.
ERROR 42000: Too big precision 66 specified for 'f1'. Maximum is 65
DROP PROCEDURE IF EXISTS sp1//
Warnings:
Note 1305 PROCEDURE db_storedproc.sp1 does not exist
@ -1549,7 +1549,7 @@ BEGIN
SET f1 = 1000000 + f1;
RETURN f1;
END//
ERROR 42000: Too big scale 61 specified for 'f1'. Maximum is 38.
ERROR 42000: Too big scale 61 specified for 'f1'. Maximum is 38
SELECT fn1( 1.3326e+8 );
ERROR 42000: FUNCTION db_storedproc.fn1 does not exist
CREATE FUNCTION fn1( f1 DECIMAL(63, 30) ) RETURNS DECIMAL(63, 30)
@ -5839,7 +5839,7 @@ fetch cur1 into e;
SELECT x, y, z, a, b, c, d, e;
close cur1;
END//
ERROR 42000: Too big scale 255 specified for 'b'. Maximum is 38.
ERROR 42000: Too big scale 255 specified for 'b'. Maximum is 38
CALL sp6();
ERROR 42000: PROCEDURE db_storedproc.sp6 does not exist
DROP PROCEDURE IF EXISTS sp6;
@ -22263,7 +22263,7 @@ delete from res_t9;
drop table res_t9;
return i1;
END//
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
DROP FUNCTION IF EXISTS fn1;
Warnings:
Note 1305 FUNCTION db_storedproc.fn1 does not exist
@ -22274,7 +22274,7 @@ create table res_t9 (f1 longtext, f2 longblob, f3 real);
drop table res_t9;
return i1;
END//
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
DROP FUNCTION IF EXISTS fn1;
Warnings:
Note 1305 FUNCTION db_storedproc.fn1 does not exist
@ -22288,7 +22288,7 @@ insert into res_t9 values (100, 'abc', 300);
drop table res_t9;
return i1;
END//
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
DROP FUNCTION IF EXISTS fn1;
Warnings:
Note 1305 FUNCTION db_storedproc.fn1 does not exist
@ -22301,7 +22301,7 @@ update res_t9 set f1 = 20;
drop table res_t9;
return i1;
END//
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
drop table res_t9;
DROP FUNCTION IF EXISTS fn1;
Warnings: