Skip to content

M
MariaDB
Commit b772666e authored by unknown's avatar unknown
Browse files
Options

Merge trift2.:/MySQL/M51/push-5.1 

into  trift2.:/MySQL/M51/clone-5.1
parents 80fb2b12 720ba8cf
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 @ b772666e
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 @ b772666e
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 @ b772666e
...@@ -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 @ b772666e
...@@ -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 @ b772666e
...@@ -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/innodb_views.result
View file @ b772666e
...@@ -863,31 +863,31 @@ CREATE TABLE t1 (f1 BIGINT); ...@@ -863,31 +863,31 @@ CREATE TABLE t1 (f1 BIGINT);
INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(1);
CREATE VIEW test.v1 AS SELECT * FROM t1 limit 2; CREATE VIEW test.v1 AS SELECT * FROM t1 limit 2;
SHOW CREATE VIEW test.v1; SHOW CREATE VIEW test.v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2 v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2 latin1 latin1_swedish_ci
SELECT * FROM test.v1; SELECT * FROM test.v1;
f1 f1
1 1
CREATE OR REPLACE ALGORITHM = TEMPTABLE VIEW test.v1 CREATE OR REPLACE ALGORITHM = TEMPTABLE VIEW test.v1
AS SELECT * FROM t1 limit 2; AS SELECT * FROM t1 limit 2;
SHOW CREATE VIEW test.v1; SHOW CREATE VIEW test.v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2 v1 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2 latin1 latin1_swedish_ci
SELECT * FROM test.v1; SELECT * FROM test.v1;
f1 f1
1 1
CREATE OR REPLACE VIEW test.v1 AS SELECT * FROM tb2 limit 2; CREATE OR REPLACE VIEW test.v1 AS SELECT * FROM tb2 limit 2;
SHOW CREATE VIEW test.v1; SHOW CREATE VIEW test.v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `f59`,`tb2`.`f60` AS `f60`,`tb2`.`f61` AS `f61`,`tb2`.`f62` AS `f62`,`tb2`.`f63` AS `f63`,`tb2`.`f64` AS `f64`,`tb2`.`f65` AS `f65`,`tb2`.`f66` AS `f66`,`tb2`.`f67` AS `f67`,`tb2`.`f68` AS `f68`,`tb2`.`f69` AS `f69`,`tb2`.`f70` AS `f70`,`tb2`.`f71` AS `f71`,`tb2`.`f72` AS `f72`,`tb2`.`f73` AS `f73`,`tb2`.`f74` AS `f74`,`tb2`.`f75` AS `f75`,`tb2`.`f76` AS `f76`,`tb2`.`f77` AS `f77`,`tb2`.`f78` AS `f78`,`tb2`.`f79` AS `f79`,`tb2`.`f80` AS `f80`,`tb2`.`f81` AS `f81`,`tb2`.`f82` AS `f82`,`tb2`.`f83` AS `f83`,`tb2`.`f84` AS `f84`,`tb2`.`f85` AS `f85`,`tb2`.`f86` AS `f86`,`tb2`.`f87` AS `f87`,`tb2`.`f88` AS `f88`,`tb2`.`f89` AS `f89`,`tb2`.`f90` AS `f90`,`tb2`.`f91` AS `f91`,`tb2`.`f92` AS `f92`,`tb2`.`f93` AS `f93`,`tb2`.`f94` AS `f94`,`tb2`.`f95` AS `f95`,`tb2`.`f96` AS `f96`,`tb2`.`f97` AS `f97`,`tb2`.`f98` AS `f98`,`tb2`.`f99` AS `f99`,`tb2`.`f100` AS `f100`,`tb2`.`f101` AS `f101`,`tb2`.`f102` AS `f102`,`tb2`.`f103` AS `f103`,`tb2`.`f104` AS `f104`,`tb2`.`f105` AS `f105`,`tb2`.`f106` AS `f106`,`tb2`.`f107` AS `f107`,`tb2`.`f108` AS `f108`,`tb2`.`f109` AS `f109` from `tb2` limit 2 v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `f59`,`tb2`.`f60` AS `f60`,`tb2`.`f61` AS `f61`,`tb2`.`f62` AS `f62`,`tb2`.`f63` AS `f63`,`tb2`.`f64` AS `f64`,`tb2`.`f65` AS `f65`,`tb2`.`f66` AS `f66`,`tb2`.`f67` AS `f67`,`tb2`.`f68` AS `f68`,`tb2`.`f69` AS `f69`,`tb2`.`f70` AS `f70`,`tb2`.`f71` AS `f71`,`tb2`.`f72` AS `f72`,`tb2`.`f73` AS `f73`,`tb2`.`f74` AS `f74`,`tb2`.`f75` AS `f75`,`tb2`.`f76` AS `f76`,`tb2`.`f77` AS `f77`,`tb2`.`f78` AS `f78`,`tb2`.`f79` AS `f79`,`tb2`.`f80` AS `f80`,`tb2`.`f81` AS `f81`,`tb2`.`f82` AS `f82`,`tb2`.`f83` AS `f83`,`tb2`.`f84` AS `f84`,`tb2`.`f85` AS `f85`,`tb2`.`f86` AS `f86`,`tb2`.`f87` AS `f87`,`tb2`.`f88` AS `f88`,`tb2`.`f89` AS `f89`,`tb2`.`f90` AS `f90`,`tb2`.`f91` AS `f91`,`tb2`.`f92` AS `f92`,`tb2`.`f93` AS `f93`,`tb2`.`f94` AS `f94`,`tb2`.`f95` AS `f95`,`tb2`.`f96` AS `f96`,`tb2`.`f97` AS `f97`,`tb2`.`f98` AS `f98`,`tb2`.`f99` AS `f99`,`tb2`.`f100` AS `f100`,`tb2`.`f101` AS `f101`,`tb2`.`f102` AS `f102`,`tb2`.`f103` AS `f103`,`tb2`.`f104` AS `f104`,`tb2`.`f105` AS `f105`,`tb2`.`f106` AS `f106`,`tb2`.`f107` AS `f107`,`tb2`.`f108` AS `f108`,`tb2`.`f109` AS `f109` from `tb2` limit 2 latin1 latin1_swedish_ci
SELECT * FROM test.v1 ; SELECT * FROM test.v1 ;
f59 f60 f61 f62 f63 f64 f65 f66 f67 f68 f69 f70 f71 f72 f73 f74 f75 f76 f77 f78 f79 f80 f81 f82 f83 f84 f85 f86 f87 f88 f89 f90 f91 f92 f93 f94 f95 f96 f97 f98 f99 f100 f101 f102 f103 f104 f105 f106 f107 f108 f109 f59 f60 f61 f62 f63 f64 f65 f66 f67 f68 f69 f70 f71 f72 f73 f74 f75 f76 f77 f78 f79 f80 f81 f82 f83 f84 f85 f86 f87 f88 f89 f90 f91 f92 f93 f94 f95 f96 f97 f98 f99 f100 f101 f102 f103 f104 f105 f106 f107 f108 f109
1 1 0000000001 0000000000000000000000000000000000000000000000000000000000000001 0000000001 0000000000000000000000000000000000000000000000000000000000000001 -5 0.000000000000000000000000000000 1 0.000000000000000000000000000000 0000000001 000000000000000000000000000000000.000000000000000000000000000000 0000000001 000000000000000000000000000000000.000000000000000000000000000000 -1.17549435e-38 1.175494352e-38 00000001.175494352e-38 00000001.175494352e-38 -1.17549435e-38 1.175494352e-38 00000001.175494352e-38 00000001.175494352e-38 -1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549e-38 1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549435e-38 1.17549e-38 1.175494352e-38 01.17549e-38 00000001.175494352e-38 01.17549e-38 00000001.175494352e-38 1000-01-01 838:59:58 1970-01-02 00:00:01 1970-01-02 00:00:01 1902 1902 1902 2enum 2set 1 1 0000000001 0000000000000000000000000000000000000000000000000000000000000001 0000000001 0000000000000000000000000000000000000000000000000000000000000001 -5 0.000000000000000000000000000000 1 0.000000000000000000000000000000 0000000001 000000000000000000000000000000000.000000000000000000000000000000 0000000001 000000000000000000000000000000000.000000000000000000000000000000 -1.17549435e-38 1.175494352e-38 00000001.175494352e-38 00000001.175494352e-38 -1.17549435e-38 1.175494352e-38 00000001.175494352e-38 00000001.175494352e-38 -1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549e-38 1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549435e-38 1.17549e-38 1.175494352e-38 01.17549e-38 00000001.175494352e-38 01.17549e-38 00000001.175494352e-38 1000-01-01 838:59:58 1970-01-02 00:00:01 1970-01-02 00:00:01 1902 1902 1902 2enum 2set
2 2 0000000002 0000000000000000000000000000000000000000000000000000000000000002 0000000002 0000000000000000000000000000000000000000000000000000000000000002 -4 1.100000000000000000000000000000 2 1.100000000000000000000000000000 0000000002 000000000000000000000000000000001.100000000000000000000000000000 0000000002 000000000000000000000000000000001.100000000000000000000000000000 -1.175494349e-38 1.175494353e-38 00000001.175494353e-38 00000001.175494353e-38 -1.175494349e-38 1.175494353e-38 00000001.175494353e-38 00000001.175494353e-38 -1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549e-38 1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.175494349e-38 1.17549e-38 1.175494353e-38 01.17549e-38 00000001.175494353e-38 01.17549e-38 00000001.175494353e-38 1000-01-02 838:59:57 1970-01-03 00:00:02 1970-01-03 00:00:02 1903 1903 1903 1enum 1set,2set 2 2 0000000002 0000000000000000000000000000000000000000000000000000000000000002 0000000002 0000000000000000000000000000000000000000000000000000000000000002 -4 1.100000000000000000000000000000 2 1.100000000000000000000000000000 0000000002 000000000000000000000000000000001.100000000000000000000000000000 0000000002 000000000000000000000000000000001.100000000000000000000000000000 -1.175494349e-38 1.175494353e-38 00000001.175494353e-38 00000001.175494353e-38 -1.175494349e-38 1.175494353e-38 00000001.175494353e-38 00000001.175494353e-38 -1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549e-38 1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.175494349e-38 1.17549e-38 1.175494353e-38 01.17549e-38 00000001.175494353e-38 01.17549e-38 00000001.175494353e-38 1000-01-02 838:59:57 1970-01-03 00:00:02 1970-01-03 00:00:02 1903 1903 1903 1enum 1set,2set
CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2 limit 10,100; CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2 limit 10,100;
SHOW CREATE VIEW test.v1; SHOW CREATE VIEW test.v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `F59` from `tb2` limit 10,100 v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `F59` from `tb2` limit 10,100 latin1 latin1_swedish_ci
SELECT * FROM test.v1; SELECT * FROM test.v1;
F59 F59
76710 76710
...@@ -965,38 +965,38 @@ CREATE TABLE t1 (f1 NUMERIC(15,3)); ...@@ -965,38 +965,38 @@ CREATE TABLE t1 (f1 NUMERIC(15,3));
INSERT INTO t1 VALUES(8.8); INSERT INTO t1 VALUES(8.8);
CREATE VIEW v1 AS SELECT * FROM t1; CREATE VIEW v1 AS SELECT * FROM t1;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci
SELECT * FROM v1; SELECT * FROM v1;
f1 f1
8.800 8.800
CREATE OR REPLACE VIEW v1 AS SELECT f1 FROM t1; CREATE OR REPLACE VIEW v1 AS SELECT f1 FROM t1;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci
SELECT * FROM v1; SELECT * FROM v1;
f1 f1
8.800 8.800
CREATE OR REPLACE VIEW v1 AS SELECT f1 As my_column FROM t1; CREATE OR REPLACE VIEW v1 AS SELECT f1 As my_column FROM t1;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `my_column` from `t1` v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `my_column` from `t1` latin1 latin1_swedish_ci
SELECT * FROM v1; SELECT * FROM v1;
my_column my_column
8.800 8.800
CREATE OR REPLACE VIEW v1(column1,column2) CREATE OR REPLACE VIEW v1(column1,column2)
AS SELECT f1 As my_column, f1 FROM t1; AS SELECT f1 As my_column, f1 FROM t1;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1` v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1` latin1 latin1_swedish_ci
SELECT * FROM v1; SELECT * FROM v1;
column1 column2 column1 column2
8.800 8.800 8.800 8.800
CREATE OR REPLACE VIEW test.v1(column1,column2) CREATE OR REPLACE VIEW test.v1(column1,column2)
AS SELECT f1 As my_column, f1 FROM test.t1; AS SELECT f1 As my_column, f1 FROM test.t1;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1` v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1` latin1 latin1_swedish_ci
SELECT * FROM v1; SELECT * FROM v1;
column1 column2 column1 column2
8.800 8.800 8.800 8.800
...@@ -10250,8 +10250,8 @@ CREATE VIEW test3.v30 AS SELECT * FROM test3.v29; ...@@ -10250,8 +10250,8 @@ CREATE VIEW test3.v30 AS SELECT * FROM test3.v29;
CREATE VIEW test3.v31 AS SELECT * FROM test3.v30; CREATE VIEW test3.v31 AS SELECT * FROM test3.v30;
CREATE VIEW test3.v32 AS SELECT * FROM test3.v31; CREATE VIEW test3.v32 AS SELECT * FROM test3.v31;
SHOW CREATE VIEW test3.v32; SHOW CREATE VIEW test3.v32;
View Create View View Create View character_set_client collation_connection
v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31` v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31` latin1 latin1_swedish_ci
SELECT * FROM test3.v32; SELECT * FROM test3.v32;
f1 f1
1.000 1.000
...@@ -10260,8 +10260,8 @@ id select_type table type possible_keys key key_len ref rows Extra ...@@ -10260,8 +10260,8 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 1 1 SIMPLE t1 ALL NULL NULL NULL NULL 1
DROP VIEW test3.v0; DROP VIEW test3.v0;
SHOW CREATE VIEW test3.v32; SHOW CREATE VIEW test3.v32;
View Create View View Create View character_set_client collation_connection
v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31` v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31` latin1 latin1_swedish_ci
Warnings: Warnings:
Warning 1356 View 'test3.v32' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them Warning 1356 View 'test3.v32' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
SELECT * FROM test3.v32; SELECT * FROM test3.v32;
...@@ -10389,8 +10389,8 @@ FROM test2.t1 tab1 NATURAL JOIN test1.v27 tab2; ...@@ -10389,8 +10389,8 @@ FROM test2.t1 tab1 NATURAL JOIN test1.v27 tab2;
CREATE OR REPLACE VIEW test1.v29 AS SELECT f1, f2 CREATE OR REPLACE VIEW test1.v29 AS SELECT f1, f2
FROM test3.t1 tab1 NATURAL JOIN test1.v28 tab2; FROM test3.t1 tab1 NATURAL JOIN test1.v28 tab2;
SHOW CREATE VIEW test1.v29; SHOW CREATE VIEW test1.v29;
View Create View View Create View character_set_client collation_connection
v29 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v29` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v28` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) v29 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v29` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v28` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1, SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
CAST(f2 AS CHAR) AS f2 FROM test1.v29; CAST(f2 AS CHAR) AS f2 FROM test1.v29;
f1 f2 f1 f2
...@@ -10405,8 +10405,8 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v29; ...@@ -10405,8 +10405,8 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v29;
CREATE VIEW test1.v30 AS SELECT f1, f2 CREATE VIEW test1.v30 AS SELECT f1, f2
FROM test3.t1 tab1 NATURAL JOIN test1.v29 tab2; FROM test3.t1 tab1 NATURAL JOIN test1.v29 tab2;
SHOW CREATE VIEW test1.v30; SHOW CREATE VIEW test1.v30;
View Create View View Create View character_set_client collation_connection
v30 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v30` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v29` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) v30 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v30` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v29` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1, SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
CAST(f2 AS CHAR) AS f2 FROM test1.v30; CAST(f2 AS CHAR) AS f2 FROM test1.v30;
f1 f2 f1 f2
......
mysql-test/suite/funcs_1/r/memory__datadict.result
View file @ b772666e
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_func_view.result
View file @ b772666e
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 @ b772666e
...@@ -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 @ b772666e
...@@ -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 @ b772666e
...@@ -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_views.result
View file @ b772666e
...@@ -867,31 +867,31 @@ CREATE TABLE t1 (f1 BIGINT); ...@@ -867,31 +867,31 @@ CREATE TABLE t1 (f1 BIGINT);
INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(1);
CREATE VIEW test.v1 AS SELECT * FROM t1 limit 2; CREATE VIEW test.v1 AS SELECT * FROM t1 limit 2;
SHOW CREATE VIEW test.v1; SHOW CREATE VIEW test.v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2 v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2 latin1 latin1_swedish_ci
SELECT * FROM test.v1; SELECT * FROM test.v1;
f1 f1
1 1
CREATE OR REPLACE ALGORITHM = TEMPTABLE VIEW test.v1 CREATE OR REPLACE ALGORITHM = TEMPTABLE VIEW test.v1
AS SELECT * FROM t1 limit 2; AS SELECT * FROM t1 limit 2;
SHOW CREATE VIEW test.v1; SHOW CREATE VIEW test.v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2 v1 CREATE ALGORITHM=TEMPTABLE DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` limit 2 latin1 latin1_swedish_ci
SELECT * FROM test.v1; SELECT * FROM test.v1;
f1 f1
1 1
CREATE OR REPLACE VIEW test.v1 AS SELECT * FROM tb2 limit 2; CREATE OR REPLACE VIEW test.v1 AS SELECT * FROM tb2 limit 2;
SHOW CREATE VIEW test.v1; SHOW CREATE VIEW test.v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `f59`,`tb2`.`f60` AS `f60`,`tb2`.`f61` AS `f61`,`tb2`.`f62` AS `f62`,`tb2`.`f63` AS `f63`,`tb2`.`f64` AS `f64`,`tb2`.`f65` AS `f65`,`tb2`.`f66` AS `f66`,`tb2`.`f67` AS `f67`,`tb2`.`f68` AS `f68`,`tb2`.`f69` AS `f69`,`tb2`.`f70` AS `f70`,`tb2`.`f71` AS `f71`,`tb2`.`f72` AS `f72`,`tb2`.`f73` AS `f73`,`tb2`.`f74` AS `f74`,`tb2`.`f75` AS `f75`,`tb2`.`f76` AS `f76`,`tb2`.`f77` AS `f77`,`tb2`.`f78` AS `f78`,`tb2`.`f79` AS `f79`,`tb2`.`f80` AS `f80`,`tb2`.`f81` AS `f81`,`tb2`.`f82` AS `f82`,`tb2`.`f83` AS `f83`,`tb2`.`f84` AS `f84`,`tb2`.`f85` AS `f85`,`tb2`.`f86` AS `f86`,`tb2`.`f87` AS `f87`,`tb2`.`f88` AS `f88`,`tb2`.`f89` AS `f89`,`tb2`.`f90` AS `f90`,`tb2`.`f91` AS `f91`,`tb2`.`f92` AS `f92`,`tb2`.`f93` AS `f93`,`tb2`.`f94` AS `f94`,`tb2`.`f95` AS `f95`,`tb2`.`f96` AS `f96`,`tb2`.`f97` AS `f97`,`tb2`.`f98` AS `f98`,`tb2`.`f99` AS `f99`,`tb2`.`f100` AS `f100`,`tb2`.`f101` AS `f101`,`tb2`.`f102` AS `f102`,`tb2`.`f103` AS `f103`,`tb2`.`f104` AS `f104`,`tb2`.`f105` AS `f105`,`tb2`.`f106` AS `f106`,`tb2`.`f107` AS `f107`,`tb2`.`f108` AS `f108`,`tb2`.`f109` AS `f109` from `tb2` limit 2 v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `f59`,`tb2`.`f60` AS `f60`,`tb2`.`f61` AS `f61`,`tb2`.`f62` AS `f62`,`tb2`.`f63` AS `f63`,`tb2`.`f64` AS `f64`,`tb2`.`f65` AS `f65`,`tb2`.`f66` AS `f66`,`tb2`.`f67` AS `f67`,`tb2`.`f68` AS `f68`,`tb2`.`f69` AS `f69`,`tb2`.`f70` AS `f70`,`tb2`.`f71` AS `f71`,`tb2`.`f72` AS `f72`,`tb2`.`f73` AS `f73`,`tb2`.`f74` AS `f74`,`tb2`.`f75` AS `f75`,`tb2`.`f76` AS `f76`,`tb2`.`f77` AS `f77`,`tb2`.`f78` AS `f78`,`tb2`.`f79` AS `f79`,`tb2`.`f80` AS `f80`,`tb2`.`f81` AS `f81`,`tb2`.`f82` AS `f82`,`tb2`.`f83` AS `f83`,`tb2`.`f84` AS `f84`,`tb2`.`f85` AS `f85`,`tb2`.`f86` AS `f86`,`tb2`.`f87` AS `f87`,`tb2`.`f88` AS `f88`,`tb2`.`f89` AS `f89`,`tb2`.`f90` AS `f90`,`tb2`.`f91` AS `f91`,`tb2`.`f92` AS `f92`,`tb2`.`f93` AS `f93`,`tb2`.`f94` AS `f94`,`tb2`.`f95` AS `f95`,`tb2`.`f96` AS `f96`,`tb2`.`f97` AS `f97`,`tb2`.`f98` AS `f98`,`tb2`.`f99` AS `f99`,`tb2`.`f100` AS `f100`,`tb2`.`f101` AS `f101`,`tb2`.`f102` AS `f102`,`tb2`.`f103` AS `f103`,`tb2`.`f104` AS `f104`,`tb2`.`f105` AS `f105`,`tb2`.`f106` AS `f106`,`tb2`.`f107` AS `f107`,`tb2`.`f108` AS `f108`,`tb2`.`f109` AS `f109` from `tb2` limit 2 latin1 latin1_swedish_ci
SELECT * FROM test.v1 ; SELECT * FROM test.v1 ;
f59 f60 f61 f62 f63 f64 f65 f66 f67 f68 f69 f70 f71 f72 f73 f74 f75 f76 f77 f78 f79 f80 f81 f82 f83 f84 f85 f86 f87 f88 f89 f90 f91 f92 f93 f94 f95 f96 f97 f98 f99 f100 f101 f102 f103 f104 f105 f106 f107 f108 f109 f59 f60 f61 f62 f63 f64 f65 f66 f67 f68 f69 f70 f71 f72 f73 f74 f75 f76 f77 f78 f79 f80 f81 f82 f83 f84 f85 f86 f87 f88 f89 f90 f91 f92 f93 f94 f95 f96 f97 f98 f99 f100 f101 f102 f103 f104 f105 f106 f107 f108 f109
1 1 0000000001 0000000000000000000000000000000000000000000000000000000000000001 0000000001 0000000000000000000000000000000000000000000000000000000000000001 -5 0.000000000000000000000000000000 1 0.000000000000000000000000000000 0000000001 000000000000000000000000000000000.000000000000000000000000000000 0000000001 000000000000000000000000000000000.000000000000000000000000000000 -1.17549435e-38 1.175494352e-38 00000001.175494352e-38 00000001.175494352e-38 -1.17549435e-38 1.175494352e-38 00000001.175494352e-38 00000001.175494352e-38 -1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549e-38 1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549435e-38 1.17549e-38 1.175494352e-38 01.17549e-38 00000001.175494352e-38 01.17549e-38 00000001.175494352e-38 1000-01-01 838:59:58 1970-01-02 00:00:01 1970-01-02 00:00:01 1902 1902 1902 2enum 2set 1 1 0000000001 0000000000000000000000000000000000000000000000000000000000000001 0000000001 0000000000000000000000000000000000000000000000000000000000000001 -5 0.000000000000000000000000000000 1 0.000000000000000000000000000000 0000000001 000000000000000000000000000000000.000000000000000000000000000000 0000000001 000000000000000000000000000000000.000000000000000000000000000000 -1.17549435e-38 1.175494352e-38 00000001.175494352e-38 00000001.175494352e-38 -1.17549435e-38 1.175494352e-38 00000001.175494352e-38 00000001.175494352e-38 -1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549e-38 1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549435e-38 1.17549e-38 1.175494352e-38 01.17549e-38 00000001.175494352e-38 01.17549e-38 00000001.175494352e-38 1000-01-01 838:59:58 1970-01-02 00:00:01 1970-01-02 00:00:01 1902 1902 1902 2enum 2set
2 2 0000000002 0000000000000000000000000000000000000000000000000000000000000002 0000000002 0000000000000000000000000000000000000000000000000000000000000002 -4 1.100000000000000000000000000000 2 1.100000000000000000000000000000 0000000002 000000000000000000000000000000001.100000000000000000000000000000 0000000002 000000000000000000000000000000001.100000000000000000000000000000 -1.175494349e-38 1.175494353e-38 00000001.175494353e-38 00000001.175494353e-38 -1.175494349e-38 1.175494353e-38 00000001.175494353e-38 00000001.175494353e-38 -1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549e-38 1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.175494349e-38 1.17549e-38 1.175494353e-38 01.17549e-38 00000001.175494353e-38 01.17549e-38 00000001.175494353e-38 1000-01-02 838:59:57 1970-01-03 00:00:02 1970-01-03 00:00:02 1903 1903 1903 1enum 1set,2set 2 2 0000000002 0000000000000000000000000000000000000000000000000000000000000002 0000000002 0000000000000000000000000000000000000000000000000000000000000002 -4 1.100000000000000000000000000000 2 1.100000000000000000000000000000 0000000002 000000000000000000000000000000001.100000000000000000000000000000 0000000002 000000000000000000000000000000001.100000000000000000000000000000 -1.175494349e-38 1.175494353e-38 00000001.175494353e-38 00000001.175494353e-38 -1.175494349e-38 1.175494353e-38 00000001.175494353e-38 00000001.175494353e-38 -1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.17549e-38 1.17549e-38 1.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 01.17549e-38 -1.17549e-38 -1.175494349e-38 1.17549e-38 1.175494353e-38 01.17549e-38 00000001.175494353e-38 01.17549e-38 00000001.175494353e-38 1000-01-02 838:59:57 1970-01-03 00:00:02 1970-01-03 00:00:02 1903 1903 1903 1enum 1set,2set
CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2 limit 10,100; CREATE OR REPLACE VIEW test.v1 AS SELECT F59 FROM tb2 limit 10,100;
SHOW CREATE VIEW test.v1; SHOW CREATE VIEW test.v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `F59` from `tb2` limit 10,100 v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `tb2`.`f59` AS `F59` from `tb2` limit 10,100 latin1 latin1_swedish_ci
SELECT * FROM test.v1; SELECT * FROM test.v1;
F59 F59
76710 76710
...@@ -969,38 +969,38 @@ CREATE TABLE t1 (f1 NUMERIC(15,3)); ...@@ -969,38 +969,38 @@ CREATE TABLE t1 (f1 NUMERIC(15,3));
INSERT INTO t1 VALUES(8.8); INSERT INTO t1 VALUES(8.8);
CREATE VIEW v1 AS SELECT * FROM t1; CREATE VIEW v1 AS SELECT * FROM t1;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci
SELECT * FROM v1; SELECT * FROM v1;
f1 f1
8.800 8.800
CREATE OR REPLACE VIEW v1 AS SELECT f1 FROM t1; CREATE OR REPLACE VIEW v1 AS SELECT f1 FROM t1;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `f1` from `t1` latin1 latin1_swedish_ci
SELECT * FROM v1; SELECT * FROM v1;
f1 f1
8.800 8.800
CREATE OR REPLACE VIEW v1 AS SELECT f1 As my_column FROM t1; CREATE OR REPLACE VIEW v1 AS SELECT f1 As my_column FROM t1;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `my_column` from `t1` v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `my_column` from `t1` latin1 latin1_swedish_ci
SELECT * FROM v1; SELECT * FROM v1;
my_column my_column
8.800 8.800
CREATE OR REPLACE VIEW v1(column1,column2) CREATE OR REPLACE VIEW v1(column1,column2)
AS SELECT f1 As my_column, f1 FROM t1; AS SELECT f1 As my_column, f1 FROM t1;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1` v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1` latin1 latin1_swedish_ci
SELECT * FROM v1; SELECT * FROM v1;
column1 column2 column1 column2
8.800 8.800 8.800 8.800
CREATE OR REPLACE VIEW test.v1(column1,column2) CREATE OR REPLACE VIEW test.v1(column1,column2)
AS SELECT f1 As my_column, f1 FROM test.t1; AS SELECT f1 As my_column, f1 FROM test.t1;
SHOW CREATE VIEW v1; SHOW CREATE VIEW v1;
View Create View View Create View character_set_client collation_connection
v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1` v1 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`f1` AS `column1`,`t1`.`f1` AS `column2` from `t1` latin1 latin1_swedish_ci
SELECT * FROM v1; SELECT * FROM v1;
column1 column2 column1 column2
8.800 8.800 8.800 8.800
...@@ -10255,8 +10255,8 @@ CREATE VIEW test3.v30 AS SELECT * FROM test3.v29; ...@@ -10255,8 +10255,8 @@ CREATE VIEW test3.v30 AS SELECT * FROM test3.v29;
CREATE VIEW test3.v31 AS SELECT * FROM test3.v30; CREATE VIEW test3.v31 AS SELECT * FROM test3.v30;
CREATE VIEW test3.v32 AS SELECT * FROM test3.v31; CREATE VIEW test3.v32 AS SELECT * FROM test3.v31;
SHOW CREATE VIEW test3.v32; SHOW CREATE VIEW test3.v32;
View Create View View Create View character_set_client collation_connection
v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31` v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31` latin1 latin1_swedish_ci
SELECT * FROM test3.v32; SELECT * FROM test3.v32;
f1 f1
1.000 1.000
...@@ -10265,8 +10265,8 @@ id select_type table type possible_keys key key_len ref rows Extra ...@@ -10265,8 +10265,8 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 system NULL NULL NULL NULL 1 1 SIMPLE t1 system NULL NULL NULL NULL 1
DROP VIEW test3.v0; DROP VIEW test3.v0;
SHOW CREATE VIEW test3.v32; SHOW CREATE VIEW test3.v32;
View Create View View Create View character_set_client collation_connection
v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31` v32 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test3`.`v32` AS select `v31`.`f1` AS `f1` from `test3`.`v31` latin1 latin1_swedish_ci
Warnings: Warnings:
Warning 1356 View 'test3.v32' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them Warning 1356 View 'test3.v32' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
SELECT * FROM test3.v32; SELECT * FROM test3.v32;
...@@ -10394,8 +10394,8 @@ FROM test2.t1 tab1 NATURAL JOIN test1.v27 tab2; ...@@ -10394,8 +10394,8 @@ FROM test2.t1 tab1 NATURAL JOIN test1.v27 tab2;
CREATE OR REPLACE VIEW test1.v29 AS SELECT f1, f2 CREATE OR REPLACE VIEW test1.v29 AS SELECT f1, f2
FROM test3.t1 tab1 NATURAL JOIN test1.v28 tab2; FROM test3.t1 tab1 NATURAL JOIN test1.v28 tab2;
SHOW CREATE VIEW test1.v29; SHOW CREATE VIEW test1.v29;
View Create View View Create View character_set_client collation_connection
v29 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v29` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v28` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) v29 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v29` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v28` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1, SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
CAST(f2 AS CHAR) AS f2 FROM test1.v29; CAST(f2 AS CHAR) AS f2 FROM test1.v29;
f1 f2 f1 f2
...@@ -10410,8 +10410,8 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v29; ...@@ -10410,8 +10410,8 @@ CAST(f2 AS CHAR) AS f2 FROM test1.v29;
CREATE VIEW test1.v30 AS SELECT f1, f2 CREATE VIEW test1.v30 AS SELECT f1, f2
FROM test3.t1 tab1 NATURAL JOIN test1.v29 tab2; FROM test3.t1 tab1 NATURAL JOIN test1.v29 tab2;
SHOW CREATE VIEW test1.v30; SHOW CREATE VIEW test1.v30;
View Create View View Create View character_set_client collation_connection
v30 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v30` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v29` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) v30 CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `test1`.`v30` AS select `tab1`.`f1` AS `f1`,`tab1`.`f2` AS `f2` from (`test3`.`t1` `tab1` join `test1`.`v29` `tab2` on(((`tab1`.`f1` = `tab2`.`f1`) and (`tab1`.`f2` = `tab2`.`f2`)))) latin1 latin1_swedish_ci
SELECT CAST(f1 AS SIGNED INTEGER) AS f1, SELECT CAST(f1 AS SIGNED INTEGER) AS f1,
CAST(f2 AS CHAR) AS f2 FROM test1.v30; CAST(f2 AS CHAR) AS f2 FROM test1.v30;
f1 f2 f1 f2
......
mysql-test/suite/funcs_1/r/myisam__datadict.result
View file @ b772666e
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_func_view.result
View file @ b772666e
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 @ b772666e
...@@ -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 @ b772666e
...@@ -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 @ b772666e
...@@ -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 @ b772666e
...@@ -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