Skip to content

M
mariadb
Commit 36ff1995 authored by omer@linux.site's avatar omer@linux.site
Browse files
Options

Updated funcs_1 test and result files (not including cluster) for 5.1.21

parent add9cb76
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4847 additions and 3901 deletions
mysql-test/suite/funcs_1/r/innodb__datadict.result
View file @ 36ff1995
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/innodb_func_view.result
View file @ 36ff1995
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result
View file @ 36ff1995
...@@ -90,7 +90,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored'); ...@@ -90,7 +90,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored');
END if; END if;
END// END//
SHOW CREATE PROCEDURE sp1; SHOW CREATE PROCEDURE sp1;
Procedure sql_mode Create Procedure Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
sp1 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`() sp1 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
BEGIN BEGIN
declare a tinyint; declare a tinyint;
...@@ -104,7 +104,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value restored'); ...@@ -104,7 +104,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value restored');
ELSE ELSE
INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored'); INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored');
END if; END if;
END END latin1 latin1_swedish_ci latin1_swedish_ci
set @@sql_mode=''; set @@sql_mode='';
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
Variable_name Value Variable_name Value
...@@ -143,12 +143,12 @@ SET @@sql_mode='MAXDB'; ...@@ -143,12 +143,12 @@ SET @@sql_mode='MAXDB';
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
END// END//
SHOW CREATE PROCEDURE sp2; SHOW CREATE PROCEDURE sp2;
Procedure sql_mode Create Procedure Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
sp2 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`() sp2 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
BEGIN BEGIN
SET @@sql_mode='MAXDB'; SET @@sql_mode='MAXDB';
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
END END latin1 latin1_swedish_ci latin1_swedish_ci
... show value prior calling procedure ... show value prior calling procedure
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
Variable_name Value Variable_name Value
......
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
View file @ 36ff1995
...@@ -122,6 +122,9 @@ LAST_ALTERED <created> ...@@ -122,6 +122,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT ROUTINE_COMMENT
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME fn_2 SPECIFIC_NAME fn_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -146,6 +149,9 @@ LAST_ALTERED <created> ...@@ -146,6 +149,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT created with INVOKER ROUTINE_COMMENT created with INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_1 SPECIFIC_NAME sp_1
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -168,6 +174,9 @@ LAST_ALTERED <created> ...@@ -168,6 +174,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT ROUTINE_COMMENT
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_2 SPECIFIC_NAME sp_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -190,6 +199,9 @@ LAST_ALTERED <created> ...@@ -190,6 +199,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT created with INVOKER ROUTINE_COMMENT created with INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SHOW CREATE FUNCTION fn_1; SHOW CREATE FUNCTION fn_1;
Function fn_1 Function fn_1
sql_mode sql_mode
...@@ -199,6 +211,9 @@ set @x=i1; ...@@ -199,6 +211,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE FUNCTION fn_2; SHOW CREATE FUNCTION fn_2;
Function fn_2 Function fn_2
sql_mode sql_mode
...@@ -210,6 +225,9 @@ set @x=i1; ...@@ -210,6 +225,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_1; SHOW CREATE PROCEDURE sp_1;
Procedure sp_1 Procedure sp_1
sql_mode sql_mode
...@@ -217,6 +235,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int) ...@@ -217,6 +235,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_2; SHOW CREATE PROCEDURE sp_2;
Procedure sp_2 Procedure sp_2
sql_mode sql_mode
...@@ -226,6 +247,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int) ...@@ -226,6 +247,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW FUNCTION STATUS LIKE 'fn_%'; SHOW FUNCTION STATUS LIKE 'fn_%';
Db db_storedproc Db db_storedproc
Name fn_1 Name fn_1
...@@ -235,6 +259,9 @@ Modified <modified> ...@@ -235,6 +259,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment Comment
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name fn_2 Name fn_2
Type FUNCTION Type FUNCTION
...@@ -243,6 +270,9 @@ Modified <modified> ...@@ -243,6 +270,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment created with INVOKER Comment created with INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW PROCEDURE STATUS LIKE 'sp_%'; SHOW PROCEDURE STATUS LIKE 'sp_%';
Db db_storedproc Db db_storedproc
Name sp_1 Name sp_1
...@@ -252,6 +282,9 @@ Modified <modified> ...@@ -252,6 +282,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment Comment
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name sp_2 Name sp_2
Type PROCEDURE Type PROCEDURE
...@@ -260,6 +293,9 @@ Modified <modified> ...@@ -260,6 +293,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment created with INVOKER Comment created with INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
... now change some stuff: ... now change some stuff:
-------------------------- --------------------------
...@@ -304,6 +340,9 @@ LAST_ALTERED <created> ...@@ -304,6 +340,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, FN changed to INVOKER ROUTINE_COMMENT new comment, FN changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME fn_2 SPECIFIC_NAME fn_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -328,6 +367,9 @@ LAST_ALTERED <created> ...@@ -328,6 +367,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT FN changed to DEFINER ROUTINE_COMMENT FN changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_1 SPECIFIC_NAME sp_1
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -350,6 +392,9 @@ LAST_ALTERED <created> ...@@ -350,6 +392,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, SP changed to INVOKER ROUTINE_COMMENT new comment, SP changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_2 SPECIFIC_NAME sp_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -372,6 +417,9 @@ LAST_ALTERED <created> ...@@ -372,6 +417,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT SP changed to DEFINER ROUTINE_COMMENT SP changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SHOW CREATE FUNCTION fn_1; SHOW CREATE FUNCTION fn_1;
Function fn_1 Function fn_1
sql_mode sql_mode
...@@ -384,6 +432,9 @@ set @x=i1; ...@@ -384,6 +432,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE FUNCTION fn_2; SHOW CREATE FUNCTION fn_2;
Function fn_2 Function fn_2
sql_mode sql_mode
...@@ -395,6 +446,9 @@ set @x=i1; ...@@ -395,6 +446,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_1; SHOW CREATE PROCEDURE sp_1;
Procedure sp_1 Procedure sp_1
sql_mode sql_mode
...@@ -404,6 +458,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int) ...@@ -404,6 +458,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_2; SHOW CREATE PROCEDURE sp_2;
Procedure sp_2 Procedure sp_2
sql_mode sql_mode
...@@ -413,6 +470,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int) ...@@ -413,6 +470,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW FUNCTION STATUS LIKE 'fn_%'; SHOW FUNCTION STATUS LIKE 'fn_%';
Db db_storedproc Db db_storedproc
Name fn_1 Name fn_1
...@@ -422,6 +482,9 @@ Modified <modified> ...@@ -422,6 +482,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, FN changed to INVOKER Comment new comment, FN changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name fn_2 Name fn_2
Type FUNCTION Type FUNCTION
...@@ -430,6 +493,9 @@ Modified <modified> ...@@ -430,6 +493,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment FN changed to DEFINER Comment FN changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW PROCEDURE STATUS LIKE 'sp_%'; SHOW PROCEDURE STATUS LIKE 'sp_%';
Db db_storedproc Db db_storedproc
Name sp_1 Name sp_1
...@@ -439,6 +505,9 @@ Modified <modified> ...@@ -439,6 +505,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, SP changed to INVOKER Comment new comment, SP changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name sp_2 Name sp_2
Type PROCEDURE Type PROCEDURE
...@@ -447,6 +516,9 @@ Modified <modified> ...@@ -447,6 +516,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment SP changed to DEFINER Comment SP changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
... change back to default and check result: ... change back to default and check result:
-------------------------------------------- --------------------------------------------
...@@ -479,6 +551,9 @@ LAST_ALTERED <created> ...@@ -479,6 +551,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, FN changed to INVOKER ROUTINE_COMMENT new comment, FN changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME fn_2 SPECIFIC_NAME fn_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -503,6 +578,9 @@ LAST_ALTERED <created> ...@@ -503,6 +578,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT FN changed to DEFINER ROUTINE_COMMENT FN changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_1 SPECIFIC_NAME sp_1
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -525,6 +603,9 @@ LAST_ALTERED <created> ...@@ -525,6 +603,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, SP changed to INVOKER ROUTINE_COMMENT new comment, SP changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_2 SPECIFIC_NAME sp_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -547,6 +628,9 @@ LAST_ALTERED <created> ...@@ -547,6 +628,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT SP changed to DEFINER ROUTINE_COMMENT SP changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SHOW CREATE FUNCTION fn_1; SHOW CREATE FUNCTION fn_1;
Function fn_1 Function fn_1
sql_mode sql_mode
...@@ -559,6 +643,9 @@ set @x=i1; ...@@ -559,6 +643,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE FUNCTION fn_2; SHOW CREATE FUNCTION fn_2;
Function fn_2 Function fn_2
sql_mode sql_mode
...@@ -569,6 +656,9 @@ set @x=i1; ...@@ -569,6 +656,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_1; SHOW CREATE PROCEDURE sp_1;
Procedure sp_1 Procedure sp_1
sql_mode sql_mode
...@@ -578,6 +668,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int) ...@@ -578,6 +668,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_2; SHOW CREATE PROCEDURE sp_2;
Procedure sp_2 Procedure sp_2
sql_mode sql_mode
...@@ -587,6 +680,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int) ...@@ -587,6 +680,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW FUNCTION STATUS LIKE 'fn_%'; SHOW FUNCTION STATUS LIKE 'fn_%';
Db db_storedproc Db db_storedproc
Name fn_1 Name fn_1
...@@ -596,6 +692,9 @@ Modified <modified> ...@@ -596,6 +692,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, FN changed to INVOKER Comment new comment, FN changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name fn_2 Name fn_2
Type FUNCTION Type FUNCTION
...@@ -604,6 +703,9 @@ Modified <modified> ...@@ -604,6 +703,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment FN changed to DEFINER Comment FN changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW PROCEDURE STATUS LIKE 'sp_%'; SHOW PROCEDURE STATUS LIKE 'sp_%';
Db db_storedproc Db db_storedproc
Name sp_1 Name sp_1
...@@ -613,6 +715,9 @@ Modified <modified> ...@@ -613,6 +715,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, SP changed to INVOKER Comment new comment, SP changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name sp_2 Name sp_2
Type PROCEDURE Type PROCEDURE
...@@ -621,6 +726,9 @@ Modified <modified> ...@@ -621,6 +726,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment SP changed to DEFINER Comment SP changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
... cleanup ... cleanup
----------- -----------
......
mysql-test/suite/funcs_1/r/innodb_trig_03e.result
View file @ 36ff1995
...@@ -263,7 +263,7 @@ select current_user; ...@@ -263,7 +263,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
grant select, insert, update on priv_db.t1 to test_yesprivs@localhost; grant select, insert, update on priv_db.t1 to test_yesprivs@localhost;
show grants for test_yesprivs@localhost; show grants for test_yesprivs@localhost;
Grants for test_yesprivs@localhost Grants for test_yesprivs@localhost
...@@ -296,7 +296,7 @@ select current_user; ...@@ -296,7 +296,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
show tables; show tables;
Tables_in_priv_db Tables_in_priv_db
t1 t1
...@@ -317,7 +317,7 @@ select current_user; ...@@ -317,7 +317,7 @@ select current_user;
current_user current_user
test_yesprivs@localhost test_yesprivs@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
create trigger trg1_2 before INSERT on t1 for each row create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-yes'; set new.f1 = 'trig 1_2-yes';
select current_user; select current_user;
...@@ -453,9 +453,9 @@ ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for tabl ...@@ -453,9 +453,9 @@ ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for tabl
create trigger trg1_4 before UPDATE on t1 for each row create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-yes'; set new.f1 = 'trig 1_4-yes';
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
trg1_3 INSERT t1 set new.f1 = 'trig 1_3-yes' BEFORE NULL test_yesprivs@localhost trg1_3 INSERT t1 set new.f1 = 'trig 1_3-yes' BEFORE NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
trg1_4 UPDATE t1 set new.f1 = 'trig 1_4-yes' BEFORE NULL test_yesprivs@localhost trg1_4 UPDATE t1 set new.f1 = 'trig 1_4-yes' BEFORE NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
select current_user; select current_user;
current_user current_user
test_noprivs@localhost test_noprivs@localhost
...@@ -570,11 +570,11 @@ current_user ...@@ -570,11 +570,11 @@ current_user
test_yesprivs@localhost test_yesprivs@localhost
use priv_db; use priv_db;
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
trg1_1 INSERT t1 set new.f1 = 'trig 1_1-yes' BEFORE NULL test_yesprivs@localhost trg1_1 INSERT t1 set new.f1 = 'trig 1_1-yes' BEFORE NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
select * from information_schema.triggers; select * from information_schema.triggers;
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
NULL priv_db trg1_1 INSERT NULL priv_db t1 0 NULL set new.f1 = 'trig 1_1-yes' ROW BEFORE NULL NULL OLD NEW NULL test_yesprivs@localhost NULL priv_db trg1_1 INSERT NULL priv_db t1 0 NULL set new.f1 = 'trig 1_1-yes' ROW BEFORE NULL NULL OLD NEW NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
drop trigger trg1_1; drop trigger trg1_1;
ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1' ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
select current_user; select current_user;
...@@ -863,7 +863,7 @@ select current_user; ...@@ -863,7 +863,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
grant TRIGGER on priv1_db.t1 to test_yesprivs@localhost; grant TRIGGER on priv1_db.t1 to test_yesprivs@localhost;
show grants for test_yesprivs@localhost; show grants for test_yesprivs@localhost;
Grants for test_yesprivs@localhost Grants for test_yesprivs@localhost
...@@ -878,7 +878,7 @@ select current_user; ...@@ -878,7 +878,7 @@ select current_user;
current_user current_user
test_yesprivs@localhost test_yesprivs@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
create trigger trg1_2 before INSERT on t1 for each row create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-yes'; set new.f1 = 'trig 1_2-yes';
create trigger trg2_1 before INSERT on t2 for each row create trigger trg2_1 before INSERT on t2 for each row
...@@ -990,7 +990,7 @@ select current_user; ...@@ -990,7 +990,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
grant select, insert, update ,trigger grant select, insert, update ,trigger
on priv_db.t1 to test_yesprivs@localhost on priv_db.t1 to test_yesprivs@localhost
with grant option; with grant option;
......
mysql-test/suite/funcs_1/r/memory__datadict.result
View file @ 36ff1995
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/memory_storedproc_07.result
View file @ 36ff1995
...@@ -90,7 +90,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored'); ...@@ -90,7 +90,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored');
END if; END if;
END// END//
SHOW CREATE PROCEDURE sp1; SHOW CREATE PROCEDURE sp1;
Procedure sql_mode Create Procedure Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
sp1 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`() sp1 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
BEGIN BEGIN
declare a tinyint; declare a tinyint;
...@@ -104,7 +104,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value restored'); ...@@ -104,7 +104,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value restored');
ELSE ELSE
INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored'); INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored');
END if; END if;
END END latin1 latin1_swedish_ci latin1_swedish_ci
set @@sql_mode=''; set @@sql_mode='';
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
Variable_name Value Variable_name Value
...@@ -143,12 +143,12 @@ SET @@sql_mode='MAXDB'; ...@@ -143,12 +143,12 @@ SET @@sql_mode='MAXDB';
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
END// END//
SHOW CREATE PROCEDURE sp2; SHOW CREATE PROCEDURE sp2;
Procedure sql_mode Create Procedure Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
sp2 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`() sp2 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
BEGIN BEGIN
SET @@sql_mode='MAXDB'; SET @@sql_mode='MAXDB';
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
END END latin1 latin1_swedish_ci latin1_swedish_ci
... show value prior calling procedure ... show value prior calling procedure
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
Variable_name Value Variable_name Value
......
mysql-test/suite/funcs_1/r/memory_storedproc_08.result
View file @ 36ff1995
...@@ -122,6 +122,9 @@ LAST_ALTERED <created> ...@@ -122,6 +122,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT ROUTINE_COMMENT
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME fn_2 SPECIFIC_NAME fn_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -146,6 +149,9 @@ LAST_ALTERED <created> ...@@ -146,6 +149,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT created with INVOKER ROUTINE_COMMENT created with INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_1 SPECIFIC_NAME sp_1
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -168,6 +174,9 @@ LAST_ALTERED <created> ...@@ -168,6 +174,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT ROUTINE_COMMENT
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_2 SPECIFIC_NAME sp_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -190,6 +199,9 @@ LAST_ALTERED <created> ...@@ -190,6 +199,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT created with INVOKER ROUTINE_COMMENT created with INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SHOW CREATE FUNCTION fn_1; SHOW CREATE FUNCTION fn_1;
Function fn_1 Function fn_1
sql_mode sql_mode
...@@ -199,6 +211,9 @@ set @x=i1; ...@@ -199,6 +211,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE FUNCTION fn_2; SHOW CREATE FUNCTION fn_2;
Function fn_2 Function fn_2
sql_mode sql_mode
...@@ -210,6 +225,9 @@ set @x=i1; ...@@ -210,6 +225,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_1; SHOW CREATE PROCEDURE sp_1;
Procedure sp_1 Procedure sp_1
sql_mode sql_mode
...@@ -217,6 +235,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int) ...@@ -217,6 +235,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_2; SHOW CREATE PROCEDURE sp_2;
Procedure sp_2 Procedure sp_2
sql_mode sql_mode
...@@ -226,6 +247,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int) ...@@ -226,6 +247,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW FUNCTION STATUS LIKE 'fn_%'; SHOW FUNCTION STATUS LIKE 'fn_%';
Db db_storedproc Db db_storedproc
Name fn_1 Name fn_1
...@@ -235,6 +259,9 @@ Modified <modified> ...@@ -235,6 +259,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment Comment
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name fn_2 Name fn_2
Type FUNCTION Type FUNCTION
...@@ -243,6 +270,9 @@ Modified <modified> ...@@ -243,6 +270,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment created with INVOKER Comment created with INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW PROCEDURE STATUS LIKE 'sp_%'; SHOW PROCEDURE STATUS LIKE 'sp_%';
Db db_storedproc Db db_storedproc
Name sp_1 Name sp_1
...@@ -252,6 +282,9 @@ Modified <modified> ...@@ -252,6 +282,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment Comment
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name sp_2 Name sp_2
Type PROCEDURE Type PROCEDURE
...@@ -260,6 +293,9 @@ Modified <modified> ...@@ -260,6 +293,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment created with INVOKER Comment created with INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
... now change some stuff: ... now change some stuff:
-------------------------- --------------------------
...@@ -304,6 +340,9 @@ LAST_ALTERED <created> ...@@ -304,6 +340,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, FN changed to INVOKER ROUTINE_COMMENT new comment, FN changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME fn_2 SPECIFIC_NAME fn_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -328,6 +367,9 @@ LAST_ALTERED <created> ...@@ -328,6 +367,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT FN changed to DEFINER ROUTINE_COMMENT FN changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_1 SPECIFIC_NAME sp_1
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -350,6 +392,9 @@ LAST_ALTERED <created> ...@@ -350,6 +392,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, SP changed to INVOKER ROUTINE_COMMENT new comment, SP changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_2 SPECIFIC_NAME sp_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -372,6 +417,9 @@ LAST_ALTERED <created> ...@@ -372,6 +417,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT SP changed to DEFINER ROUTINE_COMMENT SP changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SHOW CREATE FUNCTION fn_1; SHOW CREATE FUNCTION fn_1;
Function fn_1 Function fn_1
sql_mode sql_mode
...@@ -384,6 +432,9 @@ set @x=i1; ...@@ -384,6 +432,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE FUNCTION fn_2; SHOW CREATE FUNCTION fn_2;
Function fn_2 Function fn_2
sql_mode sql_mode
...@@ -395,6 +446,9 @@ set @x=i1; ...@@ -395,6 +446,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_1; SHOW CREATE PROCEDURE sp_1;
Procedure sp_1 Procedure sp_1
sql_mode sql_mode
...@@ -404,6 +458,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int) ...@@ -404,6 +458,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_2; SHOW CREATE PROCEDURE sp_2;
Procedure sp_2 Procedure sp_2
sql_mode sql_mode
...@@ -413,6 +470,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int) ...@@ -413,6 +470,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW FUNCTION STATUS LIKE 'fn_%'; SHOW FUNCTION STATUS LIKE 'fn_%';
Db db_storedproc Db db_storedproc
Name fn_1 Name fn_1
...@@ -422,6 +482,9 @@ Modified <modified> ...@@ -422,6 +482,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, FN changed to INVOKER Comment new comment, FN changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name fn_2 Name fn_2
Type FUNCTION Type FUNCTION
...@@ -430,6 +493,9 @@ Modified <modified> ...@@ -430,6 +493,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment FN changed to DEFINER Comment FN changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW PROCEDURE STATUS LIKE 'sp_%'; SHOW PROCEDURE STATUS LIKE 'sp_%';
Db db_storedproc Db db_storedproc
Name sp_1 Name sp_1
...@@ -439,6 +505,9 @@ Modified <modified> ...@@ -439,6 +505,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, SP changed to INVOKER Comment new comment, SP changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name sp_2 Name sp_2
Type PROCEDURE Type PROCEDURE
...@@ -447,6 +516,9 @@ Modified <modified> ...@@ -447,6 +516,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment SP changed to DEFINER Comment SP changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
... change back to default and check result: ... change back to default and check result:
-------------------------------------------- --------------------------------------------
...@@ -479,6 +551,9 @@ LAST_ALTERED <created> ...@@ -479,6 +551,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, FN changed to INVOKER ROUTINE_COMMENT new comment, FN changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME fn_2 SPECIFIC_NAME fn_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -503,6 +578,9 @@ LAST_ALTERED <created> ...@@ -503,6 +578,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT FN changed to DEFINER ROUTINE_COMMENT FN changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_1 SPECIFIC_NAME sp_1
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -525,6 +603,9 @@ LAST_ALTERED <created> ...@@ -525,6 +603,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, SP changed to INVOKER ROUTINE_COMMENT new comment, SP changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_2 SPECIFIC_NAME sp_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -547,6 +628,9 @@ LAST_ALTERED <created> ...@@ -547,6 +628,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT SP changed to DEFINER ROUTINE_COMMENT SP changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SHOW CREATE FUNCTION fn_1; SHOW CREATE FUNCTION fn_1;
Function fn_1 Function fn_1
sql_mode sql_mode
...@@ -559,6 +643,9 @@ set @x=i1; ...@@ -559,6 +643,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE FUNCTION fn_2; SHOW CREATE FUNCTION fn_2;
Function fn_2 Function fn_2
sql_mode sql_mode
...@@ -569,6 +656,9 @@ set @x=i1; ...@@ -569,6 +656,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_1; SHOW CREATE PROCEDURE sp_1;
Procedure sp_1 Procedure sp_1
sql_mode sql_mode
...@@ -578,6 +668,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int) ...@@ -578,6 +668,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_2; SHOW CREATE PROCEDURE sp_2;
Procedure sp_2 Procedure sp_2
sql_mode sql_mode
...@@ -587,6 +680,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int) ...@@ -587,6 +680,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW FUNCTION STATUS LIKE 'fn_%'; SHOW FUNCTION STATUS LIKE 'fn_%';
Db db_storedproc Db db_storedproc
Name fn_1 Name fn_1
...@@ -596,6 +692,9 @@ Modified <modified> ...@@ -596,6 +692,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, FN changed to INVOKER Comment new comment, FN changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name fn_2 Name fn_2
Type FUNCTION Type FUNCTION
...@@ -604,6 +703,9 @@ Modified <modified> ...@@ -604,6 +703,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment FN changed to DEFINER Comment FN changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW PROCEDURE STATUS LIKE 'sp_%'; SHOW PROCEDURE STATUS LIKE 'sp_%';
Db db_storedproc Db db_storedproc
Name sp_1 Name sp_1
...@@ -613,6 +715,9 @@ Modified <modified> ...@@ -613,6 +715,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, SP changed to INVOKER Comment new comment, SP changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name sp_2 Name sp_2
Type PROCEDURE Type PROCEDURE
...@@ -621,6 +726,9 @@ Modified <modified> ...@@ -621,6 +726,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment SP changed to DEFINER Comment SP changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
... cleanup ... cleanup
----------- -----------
......
mysql-test/suite/funcs_1/r/memory_trig_03e.result
View file @ 36ff1995
...@@ -263,7 +263,7 @@ select current_user; ...@@ -263,7 +263,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
grant select, insert, update on priv_db.t1 to test_yesprivs@localhost; grant select, insert, update on priv_db.t1 to test_yesprivs@localhost;
show grants for test_yesprivs@localhost; show grants for test_yesprivs@localhost;
Grants for test_yesprivs@localhost Grants for test_yesprivs@localhost
...@@ -296,7 +296,7 @@ select current_user; ...@@ -296,7 +296,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
show tables; show tables;
Tables_in_priv_db Tables_in_priv_db
t1 t1
...@@ -317,7 +317,7 @@ select current_user; ...@@ -317,7 +317,7 @@ select current_user;
current_user current_user
test_yesprivs@localhost test_yesprivs@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
create trigger trg1_2 before INSERT on t1 for each row create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-yes'; set new.f1 = 'trig 1_2-yes';
select current_user; select current_user;
...@@ -453,9 +453,9 @@ ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for tabl ...@@ -453,9 +453,9 @@ ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for tabl
create trigger trg1_4 before UPDATE on t1 for each row create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-yes'; set new.f1 = 'trig 1_4-yes';
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
trg1_3 INSERT t1 set new.f1 = 'trig 1_3-yes' BEFORE NULL test_yesprivs@localhost trg1_3 INSERT t1 set new.f1 = 'trig 1_3-yes' BEFORE NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
trg1_4 UPDATE t1 set new.f1 = 'trig 1_4-yes' BEFORE NULL test_yesprivs@localhost trg1_4 UPDATE t1 set new.f1 = 'trig 1_4-yes' BEFORE NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
select current_user; select current_user;
current_user current_user
test_noprivs@localhost test_noprivs@localhost
...@@ -570,11 +570,11 @@ current_user ...@@ -570,11 +570,11 @@ current_user
test_yesprivs@localhost test_yesprivs@localhost
use priv_db; use priv_db;
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
trg1_1 INSERT t1 set new.f1 = 'trig 1_1-yes' BEFORE NULL test_yesprivs@localhost trg1_1 INSERT t1 set new.f1 = 'trig 1_1-yes' BEFORE NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
select * from information_schema.triggers; select * from information_schema.triggers;
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
NULL priv_db trg1_1 INSERT NULL priv_db t1 0 NULL set new.f1 = 'trig 1_1-yes' ROW BEFORE NULL NULL OLD NEW NULL test_yesprivs@localhost NULL priv_db trg1_1 INSERT NULL priv_db t1 0 NULL set new.f1 = 'trig 1_1-yes' ROW BEFORE NULL NULL OLD NEW NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
drop trigger trg1_1; drop trigger trg1_1;
ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1' ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
select current_user; select current_user;
...@@ -863,7 +863,7 @@ select current_user; ...@@ -863,7 +863,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
grant TRIGGER on priv1_db.t1 to test_yesprivs@localhost; grant TRIGGER on priv1_db.t1 to test_yesprivs@localhost;
show grants for test_yesprivs@localhost; show grants for test_yesprivs@localhost;
Grants for test_yesprivs@localhost Grants for test_yesprivs@localhost
...@@ -878,7 +878,7 @@ select current_user; ...@@ -878,7 +878,7 @@ select current_user;
current_user current_user
test_yesprivs@localhost test_yesprivs@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
create trigger trg1_2 before INSERT on t1 for each row create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-yes'; set new.f1 = 'trig 1_2-yes';
create trigger trg2_1 before INSERT on t2 for each row create trigger trg2_1 before INSERT on t2 for each row
...@@ -990,7 +990,7 @@ select current_user; ...@@ -990,7 +990,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
grant select, insert, update ,trigger grant select, insert, update ,trigger
on priv_db.t1 to test_yesprivs@localhost on priv_db.t1 to test_yesprivs@localhost
with grant option; with grant option;
......
mysql-test/suite/funcs_1/r/myisam__datadict.result
View file @ 36ff1995
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result
View file @ 36ff1995
...@@ -90,7 +90,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored'); ...@@ -90,7 +90,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored');
END if; END if;
END// END//
SHOW CREATE PROCEDURE sp1; SHOW CREATE PROCEDURE sp1;
Procedure sql_mode Create Procedure Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
sp1 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`() sp1 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp1`()
BEGIN BEGIN
declare a tinyint; declare a tinyint;
...@@ -104,7 +104,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value restored'); ...@@ -104,7 +104,7 @@ INSERT INTO result VALUES (@cur_val_sql_mode, 'value restored');
ELSE ELSE
INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored'); INSERT INTO result VALUES (@cur_val_sql_mode, 'value not restored');
END if; END if;
END END latin1 latin1_swedish_ci latin1_swedish_ci
set @@sql_mode=''; set @@sql_mode='';
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
Variable_name Value Variable_name Value
...@@ -143,12 +143,12 @@ SET @@sql_mode='MAXDB'; ...@@ -143,12 +143,12 @@ SET @@sql_mode='MAXDB';
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
END// END//
SHOW CREATE PROCEDURE sp2; SHOW CREATE PROCEDURE sp2;
Procedure sql_mode Create Procedure Procedure sql_mode Create Procedure character_set_client collation_connection Database Collation
sp2 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`() sp2 STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER CREATE DEFINER=`root`@`localhost` PROCEDURE `sp2`()
BEGIN BEGIN
SET @@sql_mode='MAXDB'; SET @@sql_mode='MAXDB';
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
END END latin1 latin1_swedish_ci latin1_swedish_ci
... show value prior calling procedure ... show value prior calling procedure
SHOW VARIABLES LIKE 'sql_mode'; SHOW VARIABLES LIKE 'sql_mode';
Variable_name Value Variable_name Value
......
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
View file @ 36ff1995
...@@ -122,6 +122,9 @@ LAST_ALTERED <created> ...@@ -122,6 +122,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT ROUTINE_COMMENT
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME fn_2 SPECIFIC_NAME fn_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -146,6 +149,9 @@ LAST_ALTERED <created> ...@@ -146,6 +149,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT created with INVOKER ROUTINE_COMMENT created with INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_1 SPECIFIC_NAME sp_1
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -168,6 +174,9 @@ LAST_ALTERED <created> ...@@ -168,6 +174,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT ROUTINE_COMMENT
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_2 SPECIFIC_NAME sp_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -190,6 +199,9 @@ LAST_ALTERED <created> ...@@ -190,6 +199,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT created with INVOKER ROUTINE_COMMENT created with INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SHOW CREATE FUNCTION fn_1; SHOW CREATE FUNCTION fn_1;
Function fn_1 Function fn_1
sql_mode sql_mode
...@@ -199,6 +211,9 @@ set @x=i1; ...@@ -199,6 +211,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE FUNCTION fn_2; SHOW CREATE FUNCTION fn_2;
Function fn_2 Function fn_2
sql_mode sql_mode
...@@ -210,6 +225,9 @@ set @x=i1; ...@@ -210,6 +225,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_1; SHOW CREATE PROCEDURE sp_1;
Procedure sp_1 Procedure sp_1
sql_mode sql_mode
...@@ -217,6 +235,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int) ...@@ -217,6 +235,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_2; SHOW CREATE PROCEDURE sp_2;
Procedure sp_2 Procedure sp_2
sql_mode sql_mode
...@@ -226,6 +247,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int) ...@@ -226,6 +247,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW FUNCTION STATUS LIKE 'fn_%'; SHOW FUNCTION STATUS LIKE 'fn_%';
Db db_storedproc Db db_storedproc
Name fn_1 Name fn_1
...@@ -235,6 +259,9 @@ Modified <modified> ...@@ -235,6 +259,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment Comment
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name fn_2 Name fn_2
Type FUNCTION Type FUNCTION
...@@ -243,6 +270,9 @@ Modified <modified> ...@@ -243,6 +270,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment created with INVOKER Comment created with INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW PROCEDURE STATUS LIKE 'sp_%'; SHOW PROCEDURE STATUS LIKE 'sp_%';
Db db_storedproc Db db_storedproc
Name sp_1 Name sp_1
...@@ -252,6 +282,9 @@ Modified <modified> ...@@ -252,6 +282,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment Comment
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name sp_2 Name sp_2
Type PROCEDURE Type PROCEDURE
...@@ -260,6 +293,9 @@ Modified <modified> ...@@ -260,6 +293,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment created with INVOKER Comment created with INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
... now change some stuff: ... now change some stuff:
-------------------------- --------------------------
...@@ -304,6 +340,9 @@ LAST_ALTERED <created> ...@@ -304,6 +340,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, FN changed to INVOKER ROUTINE_COMMENT new comment, FN changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME fn_2 SPECIFIC_NAME fn_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -328,6 +367,9 @@ LAST_ALTERED <created> ...@@ -328,6 +367,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT FN changed to DEFINER ROUTINE_COMMENT FN changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_1 SPECIFIC_NAME sp_1
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -350,6 +392,9 @@ LAST_ALTERED <created> ...@@ -350,6 +392,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, SP changed to INVOKER ROUTINE_COMMENT new comment, SP changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_2 SPECIFIC_NAME sp_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -372,6 +417,9 @@ LAST_ALTERED <created> ...@@ -372,6 +417,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT SP changed to DEFINER ROUTINE_COMMENT SP changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SHOW CREATE FUNCTION fn_1; SHOW CREATE FUNCTION fn_1;
Function fn_1 Function fn_1
sql_mode sql_mode
...@@ -384,6 +432,9 @@ set @x=i1; ...@@ -384,6 +432,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE FUNCTION fn_2; SHOW CREATE FUNCTION fn_2;
Function fn_2 Function fn_2
sql_mode sql_mode
...@@ -395,6 +446,9 @@ set @x=i1; ...@@ -395,6 +446,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_1; SHOW CREATE PROCEDURE sp_1;
Procedure sp_1 Procedure sp_1
sql_mode sql_mode
...@@ -404,6 +458,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int) ...@@ -404,6 +458,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_2; SHOW CREATE PROCEDURE sp_2;
Procedure sp_2 Procedure sp_2
sql_mode sql_mode
...@@ -413,6 +470,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int) ...@@ -413,6 +470,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW FUNCTION STATUS LIKE 'fn_%'; SHOW FUNCTION STATUS LIKE 'fn_%';
Db db_storedproc Db db_storedproc
Name fn_1 Name fn_1
...@@ -422,6 +482,9 @@ Modified <modified> ...@@ -422,6 +482,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, FN changed to INVOKER Comment new comment, FN changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name fn_2 Name fn_2
Type FUNCTION Type FUNCTION
...@@ -430,6 +493,9 @@ Modified <modified> ...@@ -430,6 +493,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment FN changed to DEFINER Comment FN changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW PROCEDURE STATUS LIKE 'sp_%'; SHOW PROCEDURE STATUS LIKE 'sp_%';
Db db_storedproc Db db_storedproc
Name sp_1 Name sp_1
...@@ -439,6 +505,9 @@ Modified <modified> ...@@ -439,6 +505,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, SP changed to INVOKER Comment new comment, SP changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name sp_2 Name sp_2
Type PROCEDURE Type PROCEDURE
...@@ -447,6 +516,9 @@ Modified <modified> ...@@ -447,6 +516,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment SP changed to DEFINER Comment SP changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
... change back to default and check result: ... change back to default and check result:
-------------------------------------------- --------------------------------------------
...@@ -479,6 +551,9 @@ LAST_ALTERED <created> ...@@ -479,6 +551,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, FN changed to INVOKER ROUTINE_COMMENT new comment, FN changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME fn_2 SPECIFIC_NAME fn_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -503,6 +578,9 @@ LAST_ALTERED <created> ...@@ -503,6 +578,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT FN changed to DEFINER ROUTINE_COMMENT FN changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_1 SPECIFIC_NAME sp_1
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -525,6 +603,9 @@ LAST_ALTERED <created> ...@@ -525,6 +603,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT new comment, SP changed to INVOKER ROUTINE_COMMENT new comment, SP changed to INVOKER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SPECIFIC_NAME sp_2 SPECIFIC_NAME sp_2
ROUTINE_CATALOG NULL ROUTINE_CATALOG NULL
ROUTINE_SCHEMA db_storedproc ROUTINE_SCHEMA db_storedproc
...@@ -547,6 +628,9 @@ LAST_ALTERED <created> ...@@ -547,6 +628,9 @@ LAST_ALTERED <created>
SQL_MODE SQL_MODE
ROUTINE_COMMENT SP changed to DEFINER ROUTINE_COMMENT SP changed to DEFINER
DEFINER root@localhost DEFINER root@localhost
CHARACTER_SET_CLIENT latin1
COLLATION_CONNECTION latin1_swedish_ci
DATABASE_COLLATION latin1_swedish_ci
SHOW CREATE FUNCTION fn_1; SHOW CREATE FUNCTION fn_1;
Function fn_1 Function fn_1
sql_mode sql_mode
...@@ -559,6 +643,9 @@ set @x=i1; ...@@ -559,6 +643,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE FUNCTION fn_2; SHOW CREATE FUNCTION fn_2;
Function fn_2 Function fn_2
sql_mode sql_mode
...@@ -569,6 +656,9 @@ set @x=i1; ...@@ -569,6 +656,9 @@ set @x=i1;
set @y=@x; set @y=@x;
return i4; return i4;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_1; SHOW CREATE PROCEDURE sp_1;
Procedure sp_1 Procedure sp_1
sql_mode sql_mode
...@@ -578,6 +668,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int) ...@@ -578,6 +668,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_1`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW CREATE PROCEDURE sp_2; SHOW CREATE PROCEDURE sp_2;
Procedure sp_2 Procedure sp_2
sql_mode sql_mode
...@@ -587,6 +680,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int) ...@@ -587,6 +680,9 @@ Create Procedure CREATE DEFINER=`root`@`localhost` PROCEDURE `sp_2`(i1 int)
BEGIN BEGIN
set @x=i1; set @x=i1;
END END
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW FUNCTION STATUS LIKE 'fn_%'; SHOW FUNCTION STATUS LIKE 'fn_%';
Db db_storedproc Db db_storedproc
Name fn_1 Name fn_1
...@@ -596,6 +692,9 @@ Modified <modified> ...@@ -596,6 +692,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, FN changed to INVOKER Comment new comment, FN changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name fn_2 Name fn_2
Type FUNCTION Type FUNCTION
...@@ -604,6 +703,9 @@ Modified <modified> ...@@ -604,6 +703,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment FN changed to DEFINER Comment FN changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
SHOW PROCEDURE STATUS LIKE 'sp_%'; SHOW PROCEDURE STATUS LIKE 'sp_%';
Db db_storedproc Db db_storedproc
Name sp_1 Name sp_1
...@@ -613,6 +715,9 @@ Modified <modified> ...@@ -613,6 +715,9 @@ Modified <modified>
Created <created> Created <created>
Security_type INVOKER Security_type INVOKER
Comment new comment, SP changed to INVOKER Comment new comment, SP changed to INVOKER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
Db db_storedproc Db db_storedproc
Name sp_2 Name sp_2
Type PROCEDURE Type PROCEDURE
...@@ -621,6 +726,9 @@ Modified <modified> ...@@ -621,6 +726,9 @@ Modified <modified>
Created <created> Created <created>
Security_type DEFINER Security_type DEFINER
Comment SP changed to DEFINER Comment SP changed to DEFINER
character_set_client latin1
collation_connection latin1_swedish_ci
Database Collation latin1_swedish_ci
... cleanup ... cleanup
----------- -----------
......
mysql-test/suite/funcs_1/r/myisam_trig_03e.result
View file @ 36ff1995
...@@ -263,7 +263,7 @@ select current_user; ...@@ -263,7 +263,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
grant select, insert, update on priv_db.t1 to test_yesprivs@localhost; grant select, insert, update on priv_db.t1 to test_yesprivs@localhost;
show grants for test_yesprivs@localhost; show grants for test_yesprivs@localhost;
Grants for test_yesprivs@localhost Grants for test_yesprivs@localhost
...@@ -296,7 +296,7 @@ select current_user; ...@@ -296,7 +296,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
show tables; show tables;
Tables_in_priv_db Tables_in_priv_db
t1 t1
...@@ -317,7 +317,7 @@ select current_user; ...@@ -317,7 +317,7 @@ select current_user;
current_user current_user
test_yesprivs@localhost test_yesprivs@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
create trigger trg1_2 before INSERT on t1 for each row create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-yes'; set new.f1 = 'trig 1_2-yes';
select current_user; select current_user;
...@@ -453,9 +453,9 @@ ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for tabl ...@@ -453,9 +453,9 @@ ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for tabl
create trigger trg1_4 before UPDATE on t1 for each row create trigger trg1_4 before UPDATE on t1 for each row
set new.f1 = 'trig 1_4-yes'; set new.f1 = 'trig 1_4-yes';
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
trg1_3 INSERT t1 set new.f1 = 'trig 1_3-yes' BEFORE NULL test_yesprivs@localhost trg1_3 INSERT t1 set new.f1 = 'trig 1_3-yes' BEFORE NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
trg1_4 UPDATE t1 set new.f1 = 'trig 1_4-yes' BEFORE NULL test_yesprivs@localhost trg1_4 UPDATE t1 set new.f1 = 'trig 1_4-yes' BEFORE NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
select current_user; select current_user;
current_user current_user
test_noprivs@localhost test_noprivs@localhost
...@@ -570,11 +570,11 @@ current_user ...@@ -570,11 +570,11 @@ current_user
test_yesprivs@localhost test_yesprivs@localhost
use priv_db; use priv_db;
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
trg1_1 INSERT t1 set new.f1 = 'trig 1_1-yes' BEFORE NULL test_yesprivs@localhost trg1_1 INSERT t1 set new.f1 = 'trig 1_1-yes' BEFORE NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
select * from information_schema.triggers; select * from information_schema.triggers;
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
NULL priv_db trg1_1 INSERT NULL priv_db t1 0 NULL set new.f1 = 'trig 1_1-yes' ROW BEFORE NULL NULL OLD NEW NULL test_yesprivs@localhost NULL priv_db trg1_1 INSERT NULL priv_db t1 0 NULL set new.f1 = 'trig 1_1-yes' ROW BEFORE NULL NULL OLD NEW NULL test_yesprivs@localhost latin1 latin1_swedish_ci latin1_swedish_ci
drop trigger trg1_1; drop trigger trg1_1;
ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1' ERROR 42000: TRIGGER command denied to user 'test_yesprivs'@'localhost' for table 't1'
select current_user; select current_user;
...@@ -863,7 +863,7 @@ select current_user; ...@@ -863,7 +863,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
grant TRIGGER on priv1_db.t1 to test_yesprivs@localhost; grant TRIGGER on priv1_db.t1 to test_yesprivs@localhost;
show grants for test_yesprivs@localhost; show grants for test_yesprivs@localhost;
Grants for test_yesprivs@localhost Grants for test_yesprivs@localhost
...@@ -878,7 +878,7 @@ select current_user; ...@@ -878,7 +878,7 @@ select current_user;
current_user current_user
test_yesprivs@localhost test_yesprivs@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
create trigger trg1_2 before INSERT on t1 for each row create trigger trg1_2 before INSERT on t1 for each row
set new.f1 = 'trig 1_2-yes'; set new.f1 = 'trig 1_2-yes';
create trigger trg2_1 before INSERT on t2 for each row create trigger trg2_1 before INSERT on t2 for each row
...@@ -990,7 +990,7 @@ select current_user; ...@@ -990,7 +990,7 @@ select current_user;
current_user current_user
root@localhost root@localhost
show triggers; show triggers;
Trigger Event Table Statement Timing Created sql_mode Definer Trigger Event Table Statement Timing Created sql_mode Definer character_set_client collation_connection Database Collation
grant select, insert, update ,trigger grant select, insert, update ,trigger
on priv_db.t1 to test_yesprivs@localhost on priv_db.t1 to test_yesprivs@localhost
with grant option; with grant option;
......
mysql-test/suite/funcs_1/views/views_master.inc
View file @ 36ff1995
...@@ -1772,7 +1772,8 @@ SELECT * FROM v1 ORDER BY f1; ...@@ -1772,7 +1772,8 @@ SELECT * FROM v1 ORDER BY f1;
--enable_info --enable_info
# 1. The record to be inserted will be within the scope of the view. # 1. The record to be inserted will be within the scope of the view.
# But there is already a record with the PRIMARY KEY f1 = 2 . # But there is already a record with the PRIMARY KEY f1 = 2 .
--error ER_DUP_ENTRY_WITH_KEY_NAME # OBN change for 5.1.21 --error ER_DUP_ENTRY_WITH_KEY_NAME
--error ER_DUP_ENTRY
INSERT INTO v1 VALUES(2,'two'); INSERT INTO v1 VALUES(2,'two');
# 2. The record to be inserted will be within the scope of the view. # 2. The record to be inserted will be within the scope of the view.
# There is no already existing record with the PRIMARY KEY f1 = 3 . # There is no already existing record with the PRIMARY KEY f1 = 3 .
...@@ -1789,7 +1790,8 @@ SELECT * FROM v1 ORDER BY f1; ...@@ -1789,7 +1790,8 @@ SELECT * FROM v1 ORDER BY f1;
# 1. The record to be updated is within the scope of the view # 1. The record to be updated is within the scope of the view
# and will stay inside the scope. # and will stay inside the scope.
# But there is already a record with the PRIMARY KEY f1 = 2 . # But there is already a record with the PRIMARY KEY f1 = 2 .
--error ER_DUP_ENTRY_WITH_KEY_NAME # OBN change for 5.1.21 --error ER_DUP_ENTRY_WITH_KEY_NAME
--error ER_DUP_ENTRY
UPDATE v1 SET f1 = 2 WHERE f1 = 3; UPDATE v1 SET f1 = 2 WHERE f1 = 3;
# 2. The record to be updated is within the scope of the view # 2. The record to be updated is within the scope of the view
# and will stay inside the scope. # and will stay inside the scope.
...@@ -3287,7 +3289,8 @@ DELETE FROM t1; ...@@ -3287,7 +3289,8 @@ DELETE FROM t1;
# f1 gets the default 0, because we are in the native sql_mode # f1 gets the default 0, because we are in the native sql_mode
INSERT INTO v1 SET f2 = 'ABC'; INSERT INTO v1 SET f2 = 'ABC';
# f1 gets the default 0, but this value is already exists # f1 gets the default 0, but this value is already exists
--error ER_DUP_ENTRY_WITH_KEY_NAME # OBN change for 5.1.21 --error ER_DUP_ENTRY_WITH_KEY_NAME
--error ER_DUP_ENTRY
INSERT INTO v1 SET f2 = 'ABC'; INSERT INTO v1 SET f2 = 'ABC';
SELECT * from t1; SELECT * from t1;
DELETE FROM t1; DELETE FROM t1;
...@@ -3375,7 +3378,8 @@ CREATE VIEW v1 AS SELECT f2, f3 FROM t1; ...@@ -3375,7 +3378,8 @@ CREATE VIEW v1 AS SELECT f2, f3 FROM t1;
# f1 gets the default 0, because we are in the native sql_mode # f1 gets the default 0, because we are in the native sql_mode
INSERT INTO v1 SET f2 = 'ABC'; INSERT INTO v1 SET f2 = 'ABC';
# f1 gets the default 0 and this value is already exists # f1 gets the default 0 and this value is already exists
--error ER_DUP_ENTRY_WITH_KEY_NAME # OBN change for 5.1.21 --error ER_DUP_ENTRY_WITH_KEY_NAME
--error ER_DUP_ENTRY
INSERT INTO v1 SET f2 = 'ABC'; INSERT INTO v1 SET f2 = 'ABC';
SELECT * from t1; SELECT * from t1;
DELETE FROM t1; DELETE FROM t1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7