Skip to content

M
MariaDB
Commit 805511a3 authored by omer@linux.site's avatar omer@linux.site
Browse files
Options

Modifications to funcs_1 files for 5.1.22rc release including: 

 - Updated row help count information
 - Added missing 'order by' clauses (altrady fixed in build tree)
 - Fixed isses with ndb_storeproc06/10 tests (added use database)
 - Corrected use of wrong engine in ndb tests (already fixed in build tree)
 - Update to ndb__datadict to replect additional fields in I_S (already corrected in build tree)
parent 2e3b140e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2694 additions and 2583 deletions
mysql-test/suite/funcs_1/include/ndb_tb2.inc
View file @ 805511a3
...@@ -55,7 +55,7 @@ f106 year(3) not null default 2000, ...@@ -55,7 +55,7 @@ f106 year(3) not null default 2000,
f107 year(4) not null default 2000, f107 year(4) not null default 2000,
f108 enum("1enum","2enum") not null default "1enum", f108 enum("1enum","2enum") not null default "1enum",
f109 set("1set","2set") not null default "1set" f109 set("1set","2set") not null default "1set"
) engine = innodb; ) engine = ndb;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb2.txt' into table tb2 ; eval load data infile '$MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb2.txt' into table tb2 ;
mysql-test/suite/funcs_1/r/innodb__datadict.result
View file @ 805511a3
...@@ -1211,7 +1211,7 @@ TABLE_TYPE BASE TABLE ...@@ -1211,7 +1211,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 37
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -1232,7 +1232,7 @@ TABLE_TYPE BASE TABLE ...@@ -1232,7 +1232,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 424
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -1253,7 +1253,7 @@ TABLE_TYPE BASE TABLE ...@@ -1253,7 +1253,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 901
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -1274,7 +1274,7 @@ TABLE_TYPE BASE TABLE ...@@ -1274,7 +1274,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT Dynamic
TABLE_ROWS 0 TABLE_ROWS 479
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -3241,14 +3241,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE ...@@ -3241,14 +3241,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 37 NULL NULL BTREE
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_category 0 mysql name 1 name A 37 NULL NULL BTREE
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 424 NULL NULL BTREE
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql name 1 name A 424 NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 901 NULL NULL BTREE
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 479 NULL NULL BTREE
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql name 1 name A 479 NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
...@@ -3481,7 +3481,7 @@ max_recs ...@@ -3481,7 +3481,7 @@ max_recs
45 45
select max(cardinality) from statistics; select max(cardinality) from statistics;
max(cardinality) max(cardinality)
393 901
select concat("View '", select concat("View '",
table_name, "' is associated with the database '", table_schema, "'.") table_name, "' is associated with the database '", table_schema, "'.")
AS "Who is Who for the Views" AS "Who is Who for the Views"
...@@ -4547,7 +4547,7 @@ TABLE_TYPE BASE TABLE ...@@ -4547,7 +4547,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 37
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -4568,7 +4568,7 @@ TABLE_TYPE BASE TABLE ...@@ -4568,7 +4568,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 424
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -4589,7 +4589,7 @@ TABLE_TYPE BASE TABLE ...@@ -4589,7 +4589,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 901
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -4610,7 +4610,7 @@ TABLE_TYPE BASE TABLE ...@@ -4610,7 +4610,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT Dynamic
TABLE_ROWS 0 TABLE_ROWS 479
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -5826,7 +5826,7 @@ routine_definition ...@@ -5826,7 +5826,7 @@ routine_definition
select * from statistics group by index_name asc limit 0, 5; select * from statistics group by index_name asc limit 0, 5;
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
NULL mysql procs_priv 1 mysql Grantor 1 Grantor A NULL NULL NULL BTREE NULL mysql procs_priv 1 mysql Grantor 1 Grantor A NULL NULL NULL BTREE
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_category 0 mysql name 1 name A 37 NULL NULL BTREE
NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
select concat(table_schema, ', ', table_name, ', ', view_definition) view_info select concat(table_schema, ', ', table_name, ', ', view_definition) view_info
...@@ -14347,10 +14347,10 @@ NULL mysql db BASE TABLE MyISAM 10 Fixed 3 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY- ...@@ -14347,10 +14347,10 @@ NULL mysql db BASE TABLE MyISAM 10 Fixed 3 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-
NULL mysql event BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL Events NULL mysql event BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL Events
NULL mysql func BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL User defined functions NULL mysql func BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL User defined functions
NULL mysql general_log BASE TABLE CSV 10 Dynamic 1 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL General log NULL mysql general_log BASE TABLE CSV 10 Dynamic 1 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL General log
NULL mysql help_category BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help categories NULL mysql help_category BASE TABLE MyISAM 10 Fixed 37 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help categories
NULL mysql help_keyword BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help keywords NULL mysql help_keyword BASE TABLE MyISAM 10 Fixed 424 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help keywords
NULL mysql help_relation BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL keyword-topic relation NULL mysql help_relation BASE TABLE MyISAM 10 Fixed 901 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL keyword-topic relation
NULL mysql help_topic BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help topics NULL mysql help_topic BASE TABLE MyISAM 10 Dynamic 479 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help topics
NULL mysql host BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL Host privileges; Merged with database privileges NULL mysql host BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL Host privileges; Merged with database privileges
NULL mysql ndb_binlog_index BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL NULL mysql ndb_binlog_index BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL
NULL mysql plugin BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL MySQL plugins NULL mysql plugin BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL MySQL plugins
...@@ -14601,14 +14601,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE ...@@ -14601,14 +14601,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 37 NULL NULL BTREE
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_category 0 mysql name 1 name A 37 NULL NULL BTREE
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 424 NULL NULL BTREE
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql name 1 name A 424 NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 901 NULL NULL BTREE
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 479 NULL NULL BTREE
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql name 1 name A 479 NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
......
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
View file @ 805511a3
...@@ -81,6 +81,7 @@ BEGIN ...@@ -81,6 +81,7 @@ BEGIN
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz'; SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
END// END//
ERROR 42000: Access denied for user 'user_1'@'localhost' to database 'db_storedproc_1' ERROR 42000: Access denied for user 'user_1'@'localhost' to database 'db_storedproc_1'
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost'; GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost';
...@@ -92,6 +93,7 @@ CREATE PROCEDURE sp1(v1 char(20)) ...@@ -92,6 +93,7 @@ CREATE PROCEDURE sp1(v1 char(20))
BEGIN BEGIN
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz'; SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
END// END//
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
DROP USER 'user_1'@'localhost'; DROP USER 'user_1'@'localhost';
...@@ -117,6 +119,7 @@ CREATE FUNCTION fn1(v1 int) returns int ...@@ -117,6 +119,7 @@ CREATE FUNCTION fn1(v1 int) returns int
BEGIN BEGIN
return v1; return v1;
END// END//
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
drop user 'user_1'@'localhost'; drop user 'user_1'@'localhost';
......
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result
View file @ 805511a3
...@@ -58,7 +58,6 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; ...@@ -58,7 +58,6 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
Section 3.1.10 - CALL checks: Section 3.1.10 - CALL checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
USE db_storedproc;
Testcase 3.1.10.2 + 3.1.10.5: Testcase 3.1.10.2 + 3.1.10.5:
----------------------------- -----------------------------
...@@ -95,6 +94,7 @@ CALL sp31102(); ...@@ -95,6 +94,7 @@ CALL sp31102();
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
SELECT fn31105( 9 ); SELECT fn31105( 9 );
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
CALL sp31102(); CALL sp31102();
...@@ -114,6 +114,7 @@ a` a` 1000-01-01 -5000 a` -5000 ...@@ -114,6 +114,7 @@ a` a` 1000-01-01 -5000 a` -5000
SELECT fn31105( 9 ); SELECT fn31105( 9 );
fn31105( 9 ) fn31105( 9 )
81 81
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
REVOKE EXECUTE ON db_storedproc.* FROM 'user_2'@'localhost'; REVOKE EXECUTE ON db_storedproc.* FROM 'user_2'@'localhost';
...@@ -131,6 +132,7 @@ CALL sp31102(); ...@@ -131,6 +132,7 @@ CALL sp31102();
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
SELECT fn31105( 9 ); SELECT fn31105( 9 );
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
DROP PROCEDURE sp31102; DROP PROCEDURE sp31102;
......
mysql-test/suite/funcs_1/r/innodb_views.result
View file @ 805511a3
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__datadict.result
View file @ 805511a3
...@@ -1209,7 +1209,7 @@ TABLE_TYPE BASE TABLE ...@@ -1209,7 +1209,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 37
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -1230,7 +1230,7 @@ TABLE_TYPE BASE TABLE ...@@ -1230,7 +1230,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 424
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -1251,7 +1251,7 @@ TABLE_TYPE BASE TABLE ...@@ -1251,7 +1251,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 901
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -1272,7 +1272,7 @@ TABLE_TYPE BASE TABLE ...@@ -1272,7 +1272,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT Dynamic
TABLE_ROWS 0 TABLE_ROWS 479
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -3224,14 +3224,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE ...@@ -3224,14 +3224,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 37 NULL NULL BTREE
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_category 0 mysql name 1 name A 37 NULL NULL BTREE
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 424 NULL NULL BTREE
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql name 1 name A 424 NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 901 NULL NULL BTREE
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 479 NULL NULL BTREE
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql name 1 name A 479 NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
...@@ -3464,7 +3464,7 @@ max_recs ...@@ -3464,7 +3464,7 @@ max_recs
45 45
select max(cardinality) from statistics; select max(cardinality) from statistics;
max(cardinality) max(cardinality)
393 901
select concat("View '", select concat("View '",
table_name, "' is associated with the database '", table_schema, "'.") table_name, "' is associated with the database '", table_schema, "'.")
AS "Who is Who for the Views" AS "Who is Who for the Views"
...@@ -4530,7 +4530,7 @@ TABLE_TYPE BASE TABLE ...@@ -4530,7 +4530,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 37
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -4551,7 +4551,7 @@ TABLE_TYPE BASE TABLE ...@@ -4551,7 +4551,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 424
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -4572,7 +4572,7 @@ TABLE_TYPE BASE TABLE ...@@ -4572,7 +4572,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 901
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -4593,7 +4593,7 @@ TABLE_TYPE BASE TABLE ...@@ -4593,7 +4593,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT Dynamic
TABLE_ROWS 0 TABLE_ROWS 479
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -5809,7 +5809,7 @@ routine_definition ...@@ -5809,7 +5809,7 @@ routine_definition
select * from statistics group by index_name asc limit 0, 5; select * from statistics group by index_name asc limit 0, 5;
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
NULL mysql procs_priv 1 mysql Grantor 1 Grantor A NULL NULL NULL BTREE NULL mysql procs_priv 1 mysql Grantor 1 Grantor A NULL NULL NULL BTREE
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_category 0 mysql name 1 name A 37 NULL NULL BTREE
NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
select concat(table_schema, ', ', table_name, ', ', view_definition) view_info select concat(table_schema, ', ', table_name, ', ', view_definition) view_info
...@@ -14245,10 +14245,10 @@ NULL mysql db BASE TABLE MyISAM 10 Fixed 3 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY- ...@@ -14245,10 +14245,10 @@ NULL mysql db BASE TABLE MyISAM 10 Fixed 3 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-
NULL mysql event BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL Events NULL mysql event BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL Events
NULL mysql func BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL User defined functions NULL mysql func BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL User defined functions
NULL mysql general_log BASE TABLE CSV 10 Dynamic 1 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL General log NULL mysql general_log BASE TABLE CSV 10 Dynamic 1 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL General log
NULL mysql help_category BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help categories NULL mysql help_category BASE TABLE MyISAM 10 Fixed 37 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help categories
NULL mysql help_keyword BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help keywords NULL mysql help_keyword BASE TABLE MyISAM 10 Fixed 424 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help keywords
NULL mysql help_relation BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL keyword-topic relation NULL mysql help_relation BASE TABLE MyISAM 10 Fixed 901 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL keyword-topic relation
NULL mysql help_topic BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help topics NULL mysql help_topic BASE TABLE MyISAM 10 Dynamic 479 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help topics
NULL mysql host BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL Host privileges; Merged with database privileges NULL mysql host BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL Host privileges; Merged with database privileges
NULL mysql ndb_binlog_index BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL NULL mysql ndb_binlog_index BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL
NULL mysql plugin BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL MySQL plugins NULL mysql plugin BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL MySQL plugins
...@@ -14499,14 +14499,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE ...@@ -14499,14 +14499,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 37 NULL NULL BTREE
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_category 0 mysql name 1 name A 37 NULL NULL BTREE
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 424 NULL NULL BTREE
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql name 1 name A 424 NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 901 NULL NULL BTREE
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 479 NULL NULL BTREE
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql name 1 name A 479 NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
......
mysql-test/suite/funcs_1/r/memory_storedproc_06.result
View file @ 805511a3
...@@ -81,6 +81,7 @@ BEGIN ...@@ -81,6 +81,7 @@ BEGIN
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz'; SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
END// END//
ERROR 42000: Access denied for user 'user_1'@'localhost' to database 'db_storedproc_1' ERROR 42000: Access denied for user 'user_1'@'localhost' to database 'db_storedproc_1'
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost'; GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost';
...@@ -92,6 +93,7 @@ CREATE PROCEDURE sp1(v1 char(20)) ...@@ -92,6 +93,7 @@ CREATE PROCEDURE sp1(v1 char(20))
BEGIN BEGIN
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz'; SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
END// END//
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
DROP USER 'user_1'@'localhost'; DROP USER 'user_1'@'localhost';
...@@ -117,6 +119,7 @@ CREATE FUNCTION fn1(v1 int) returns int ...@@ -117,6 +119,7 @@ CREATE FUNCTION fn1(v1 int) returns int
BEGIN BEGIN
return v1; return v1;
END// END//
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
drop user 'user_1'@'localhost'; drop user 'user_1'@'localhost';
......
mysql-test/suite/funcs_1/r/memory_storedproc_10.result
View file @ 805511a3
...@@ -58,7 +58,6 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; ...@@ -58,7 +58,6 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
Section 3.1.10 - CALL checks: Section 3.1.10 - CALL checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
USE db_storedproc;
Testcase 3.1.10.2 + 3.1.10.5: Testcase 3.1.10.2 + 3.1.10.5:
----------------------------- -----------------------------
...@@ -95,6 +94,7 @@ CALL sp31102(); ...@@ -95,6 +94,7 @@ CALL sp31102();
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
SELECT fn31105( 9 ); SELECT fn31105( 9 );
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
CALL sp31102(); CALL sp31102();
...@@ -114,6 +114,7 @@ a` a` 1000-01-01 -5000 a` -5000 ...@@ -114,6 +114,7 @@ a` a` 1000-01-01 -5000 a` -5000
SELECT fn31105( 9 ); SELECT fn31105( 9 );
fn31105( 9 ) fn31105( 9 )
81 81
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
REVOKE EXECUTE ON db_storedproc.* FROM 'user_2'@'localhost'; REVOKE EXECUTE ON db_storedproc.* FROM 'user_2'@'localhost';
...@@ -131,6 +132,7 @@ CALL sp31102(); ...@@ -131,6 +132,7 @@ CALL sp31102();
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
SELECT fn31105( 9 ); SELECT fn31105( 9 );
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
DROP PROCEDURE sp31102; DROP PROCEDURE sp31102;
......
mysql-test/suite/funcs_1/r/memory_views.result
View file @ 805511a3
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__datadict.result
View file @ 805511a3
...@@ -1239,7 +1239,7 @@ TABLE_TYPE BASE TABLE ...@@ -1239,7 +1239,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 37
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -1260,7 +1260,7 @@ TABLE_TYPE BASE TABLE ...@@ -1260,7 +1260,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 424
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -1281,7 +1281,7 @@ TABLE_TYPE BASE TABLE ...@@ -1281,7 +1281,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 901
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -1302,7 +1302,7 @@ TABLE_TYPE BASE TABLE ...@@ -1302,7 +1302,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT Dynamic
TABLE_ROWS 0 TABLE_ROWS 479
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -3294,14 +3294,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE ...@@ -3294,14 +3294,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 37 NULL NULL BTREE
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_category 0 mysql name 1 name A 37 NULL NULL BTREE
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 424 NULL NULL BTREE
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql name 1 name A 424 NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 901 NULL NULL BTREE
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 479 NULL NULL BTREE
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql name 1 name A 479 NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
...@@ -3534,7 +3534,7 @@ max_recs ...@@ -3534,7 +3534,7 @@ max_recs
45 45
select max(cardinality) from statistics; select max(cardinality) from statistics;
max(cardinality) max(cardinality)
393 901
select concat("View '", select concat("View '",
table_name, "' is associated with the database '", table_schema, "'.") table_name, "' is associated with the database '", table_schema, "'.")
AS "Who is Who for the Views" AS "Who is Who for the Views"
...@@ -4600,7 +4600,7 @@ TABLE_TYPE BASE TABLE ...@@ -4600,7 +4600,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 37
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -4621,7 +4621,7 @@ TABLE_TYPE BASE TABLE ...@@ -4621,7 +4621,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 424
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -4642,7 +4642,7 @@ TABLE_TYPE BASE TABLE ...@@ -4642,7 +4642,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Fixed ROW_FORMAT Fixed
TABLE_ROWS 0 TABLE_ROWS 901
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -4663,7 +4663,7 @@ TABLE_TYPE BASE TABLE ...@@ -4663,7 +4663,7 @@ TABLE_TYPE BASE TABLE
ENGINE MyISAM ENGINE MyISAM
VERSION 10 VERSION 10
ROW_FORMAT Dynamic ROW_FORMAT Dynamic
TABLE_ROWS 0 TABLE_ROWS 479
AVG_ROW_LENGTH #ARL# AVG_ROW_LENGTH #ARL#
DATA_LENGTH #DL# DATA_LENGTH #DL#
MAX_DATA_LENGTH #MDL# MAX_DATA_LENGTH #MDL#
...@@ -5879,7 +5879,7 @@ routine_definition ...@@ -5879,7 +5879,7 @@ routine_definition
select * from statistics group by index_name asc limit 0, 5; select * from statistics group by index_name asc limit 0, 5;
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT TABLE_CATALOG TABLE_SCHEMA TABLE_NAME NON_UNIQUE INDEX_SCHEMA INDEX_NAME SEQ_IN_INDEX COLUMN_NAME COLLATION CARDINALITY SUB_PART PACKED NULLABLE INDEX_TYPE COMMENT
NULL mysql procs_priv 1 mysql Grantor 1 Grantor A NULL NULL NULL BTREE NULL mysql procs_priv 1 mysql Grantor 1 Grantor A NULL NULL NULL BTREE
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_category 0 mysql name 1 name A 37 NULL NULL BTREE
NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE NULL mysql columns_priv 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
select concat(table_schema, ', ', table_name, ', ', view_definition) view_info select concat(table_schema, ', ', table_name, ', ', view_definition) view_info
...@@ -14499,10 +14499,10 @@ NULL mysql db BASE TABLE MyISAM 10 Fixed 3 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY- ...@@ -14499,10 +14499,10 @@ NULL mysql db BASE TABLE MyISAM 10 Fixed 3 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-
NULL mysql event BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL Events NULL mysql event BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL Events
NULL mysql func BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL User defined functions NULL mysql func BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL User defined functions
NULL mysql general_log BASE TABLE CSV 10 Dynamic 1 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL General log NULL mysql general_log BASE TABLE CSV 10 Dynamic 1 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL General log
NULL mysql help_category BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help categories NULL mysql help_category BASE TABLE MyISAM 10 Fixed 37 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help categories
NULL mysql help_keyword BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help keywords NULL mysql help_keyword BASE TABLE MyISAM 10 Fixed 424 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help keywords
NULL mysql help_relation BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL keyword-topic relation NULL mysql help_relation BASE TABLE MyISAM 10 Fixed 901 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL keyword-topic relation
NULL mysql help_topic BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help topics NULL mysql help_topic BASE TABLE MyISAM 10 Dynamic 479 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_general_ci NULL help topics
NULL mysql host BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL Host privileges; Merged with database privileges NULL mysql host BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL Host privileges; Merged with database privileges
NULL mysql ndb_binlog_index BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL NULL mysql ndb_binlog_index BASE TABLE MyISAM 10 Dynamic 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss latin1_swedish_ci NULL
NULL mysql plugin BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL MySQL plugins NULL mysql plugin BASE TABLE MyISAM 10 Fixed 0 #ARL# #DL# #MDL# #IL# #DF# NULL YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss YYYY-MM-DD hh:mm:ss utf8_bin NULL MySQL plugins
...@@ -14753,14 +14753,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE ...@@ -14753,14 +14753,14 @@ NULL mysql db 1 mysql User 1 User A 1 NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 1 db A NULL NULL NULL BTREE
NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE NULL mysql event 0 mysql PRIMARY 2 name A 0 NULL NULL BTREE
NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE NULL mysql func 0 mysql PRIMARY 1 name A 0 NULL NULL BTREE
NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 0 NULL NULL BTREE NULL mysql help_category 0 mysql PRIMARY 1 help_category_id A 37 NULL NULL BTREE
NULL mysql help_category 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_category 0 mysql name 1 name A 37 NULL NULL BTREE
NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql PRIMARY 1 help_keyword_id A 424 NULL NULL BTREE
NULL mysql help_keyword 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_keyword 0 mysql name 1 name A 424 NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 1 help_keyword_id A NULL NULL NULL BTREE
NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 0 NULL NULL BTREE NULL mysql help_relation 0 mysql PRIMARY 2 help_topic_id A 901 NULL NULL BTREE
NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql PRIMARY 1 help_topic_id A 479 NULL NULL BTREE
NULL mysql help_topic 0 mysql name 1 name A 0 NULL NULL BTREE NULL mysql help_topic 0 mysql name 1 name A 479 NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 1 Host A NULL NULL NULL BTREE
NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE NULL mysql host 0 mysql PRIMARY 2 Db A 0 NULL NULL BTREE
NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE NULL mysql ndb_binlog_index 0 mysql PRIMARY 1 epoch A 0 NULL NULL BTREE
......
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
View file @ 805511a3
...@@ -81,6 +81,7 @@ BEGIN ...@@ -81,6 +81,7 @@ BEGIN
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz'; SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
END// END//
ERROR 42000: Access denied for user 'user_1'@'localhost' to database 'db_storedproc_1' ERROR 42000: Access denied for user 'user_1'@'localhost' to database 'db_storedproc_1'
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost'; GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost';
...@@ -92,6 +93,7 @@ CREATE PROCEDURE sp1(v1 char(20)) ...@@ -92,6 +93,7 @@ CREATE PROCEDURE sp1(v1 char(20))
BEGIN BEGIN
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz'; SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
END// END//
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
DROP USER 'user_1'@'localhost'; DROP USER 'user_1'@'localhost';
...@@ -117,6 +119,7 @@ CREATE FUNCTION fn1(v1 int) returns int ...@@ -117,6 +119,7 @@ CREATE FUNCTION fn1(v1 int) returns int
BEGIN BEGIN
return v1; return v1;
END// END//
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
drop user 'user_1'@'localhost'; drop user 'user_1'@'localhost';
......
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result
View file @ 805511a3
...@@ -58,7 +58,6 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; ...@@ -58,7 +58,6 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
Section 3.1.10 - CALL checks: Section 3.1.10 - CALL checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
USE db_storedproc;
Testcase 3.1.10.2 + 3.1.10.5: Testcase 3.1.10.2 + 3.1.10.5:
----------------------------- -----------------------------
...@@ -95,6 +94,7 @@ CALL sp31102(); ...@@ -95,6 +94,7 @@ CALL sp31102();
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
SELECT fn31105( 9 ); SELECT fn31105( 9 );
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
CALL sp31102(); CALL sp31102();
...@@ -114,6 +114,7 @@ a` a` 1000-01-01 -5000 a` -5000 ...@@ -114,6 +114,7 @@ a` a` 1000-01-01 -5000 a` -5000
SELECT fn31105( 9 ); SELECT fn31105( 9 );
fn31105( 9 ) fn31105( 9 )
81 81
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
REVOKE EXECUTE ON db_storedproc.* FROM 'user_2'@'localhost'; REVOKE EXECUTE ON db_storedproc.* FROM 'user_2'@'localhost';
...@@ -131,6 +132,7 @@ CALL sp31102(); ...@@ -131,6 +132,7 @@ CALL sp31102();
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
SELECT fn31105( 9 ); SELECT fn31105( 9 );
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
DROP PROCEDURE sp31102; DROP PROCEDURE sp31102;
......
mysql-test/suite/funcs_1/r/myisam_views.result
View file @ 805511a3
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/ndb__datadict.result
View file @ 805511a3
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/ndb_cursors.result
View file @ 805511a3
...@@ -75,7 +75,7 @@ Note 1265 Data truncated for column 'f45' at row 1 ...@@ -75,7 +75,7 @@ Note 1265 Data truncated for column 'f45' at row 1
Note 1265 Data truncated for column 'f47' at row 1 Note 1265 Data truncated for column 'f47' at row 1
Note 1265 Data truncated for column 'f49' at row 1 Note 1265 Data truncated for column 'f49' at row 1
Note 1265 Data truncated for column 'f51' at row 1 Note 1265 Data truncated for column 'f51' at row 1
Error 1466 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK' Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb1.txt' into table tb1 ; load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb1.txt' into table tb1 ;
NOT YET IMPLEMENTED: cursor tests NOT YET IMPLEMENTED: cursor tests
......
mysql-test/suite/funcs_1/r/ndb_func_view.result
View file @ 805511a3
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/r/ndb_storedproc_06.result
View file @ 805511a3
...@@ -81,6 +81,7 @@ BEGIN ...@@ -81,6 +81,7 @@ BEGIN
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz'; SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
END// END//
ERROR 42000: Access denied for user 'user_1'@'localhost' to database 'db_storedproc_1' ERROR 42000: Access denied for user 'user_1'@'localhost' to database 'db_storedproc_1'
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost'; GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost';
...@@ -92,6 +93,7 @@ CREATE PROCEDURE sp1(v1 char(20)) ...@@ -92,6 +93,7 @@ CREATE PROCEDURE sp1(v1 char(20))
BEGIN BEGIN
SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz'; SELECT * from db_storedproc_1.t6 where t6.f2= 'xyz';
END// END//
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
DROP USER 'user_1'@'localhost'; DROP USER 'user_1'@'localhost';
...@@ -117,6 +119,7 @@ CREATE FUNCTION fn1(v1 int) returns int ...@@ -117,6 +119,7 @@ CREATE FUNCTION fn1(v1 int) returns int
BEGIN BEGIN
return v1; return v1;
END// END//
USE db_storedproc_1;
root@localhost db_storedproc_1 root@localhost db_storedproc_1
drop user 'user_1'@'localhost'; drop user 'user_1'@'localhost';
......
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result
View file @ 805511a3
...@@ -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/ndb_storedproc_08.result
View file @ 805511a3
...@@ -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/ndb_storedproc_10.result
View file @ 805511a3
...@@ -58,7 +58,6 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11; ...@@ -58,7 +58,6 @@ load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/t4.txt' into table t11;
Section 3.1.10 - CALL checks: Section 3.1.10 - CALL checks:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
USE db_storedproc;
Testcase 3.1.10.2 + 3.1.10.5: Testcase 3.1.10.2 + 3.1.10.5:
----------------------------- -----------------------------
...@@ -95,6 +94,7 @@ CALL sp31102(); ...@@ -95,6 +94,7 @@ CALL sp31102();
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
SELECT fn31105( 9 ); SELECT fn31105( 9 );
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
CALL sp31102(); CALL sp31102();
...@@ -114,6 +114,7 @@ a` a` 1000-01-01 -5000 a` -5000 ...@@ -114,6 +114,7 @@ a` a` 1000-01-01 -5000 a` -5000
SELECT fn31105( 9 ); SELECT fn31105( 9 );
fn31105( 9 ) fn31105( 9 )
81 81
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
REVOKE EXECUTE ON db_storedproc.* FROM 'user_2'@'localhost'; REVOKE EXECUTE ON db_storedproc.* FROM 'user_2'@'localhost';
...@@ -131,6 +132,7 @@ CALL sp31102(); ...@@ -131,6 +132,7 @@ CALL sp31102();
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.sp31102'
SELECT fn31105( 9 ); SELECT fn31105( 9 );
ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105' ERROR 42000: execute command denied to user 'user_2'@'localhost' for routine 'db_storedproc.fn31105'
USE db_storedproc;
root@localhost db_storedproc root@localhost db_storedproc
DROP PROCEDURE sp31102; DROP PROCEDURE sp31102;
......
mysql-test/suite/funcs_1/r/ndb_trig_0102.result
View file @ 805511a3
...@@ -65,7 +65,7 @@ Warnings: ...@@ -65,7 +65,7 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
Error 1466 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK' Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ; load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
Testcase: 3.5.1.1: Testcase: 3.5.1.1:
...@@ -243,7 +243,7 @@ create table t1 (f1 integer) engine = ndb; ...@@ -243,7 +243,7 @@ create table t1 (f1 integer) engine = ndb;
use test; use test;
CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3 CREATE TRIGGER trig_db.trg6_2 AFTER INSERT on tb3
for each row set @ret_trg6_2 = 5; for each row set @ret_trg6_2 = 5;
ERROR HY000: Trigger in wrong schema ERROR 42S02: Table 'trig_db.tb3' doesn't exist
use trig_db; use trig_db;
CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3 CREATE TRIGGER trg6_3 AFTER INSERT on test.tb3
for each row set @ret_trg6_3 = 18; for each row set @ret_trg6_3 = 18;
......
mysql-test/suite/funcs_1/r/ndb_trig_03.result
View file @ 805511a3
...@@ -65,7 +65,7 @@ Warnings: ...@@ -65,7 +65,7 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
Error 1466 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK' Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ; load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
Testcase 3.5.3: Testcase 3.5.3:
......
mysql-test/suite/funcs_1/r/ndb_trig_03e.result
View file @ 805511a3
...@@ -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/ndb_trig_0407.result
View file @ 805511a3
...@@ -65,7 +65,7 @@ Warnings: ...@@ -65,7 +65,7 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
Error 1466 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK' Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ; load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
Testcase: 3.5: Testcase: 3.5:
......
mysql-test/suite/funcs_1/r/ndb_trig_08.result
View file @ 805511a3
...@@ -65,7 +65,7 @@ Warnings: ...@@ -65,7 +65,7 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
Error 1466 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK' Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ; load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
Testcase: 3.5: Testcase: 3.5:
...@@ -493,9 +493,8 @@ BEGIN ...@@ -493,9 +493,8 @@ BEGIN
WHILE @counter1 < new.f136 WHILE @counter1 < new.f136
SET @counter1 = @counter1 + 1; SET @counter1 = @counter1 + 1;
END// END//
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'WHILE @counter1 < new.f136 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'SET @counter1 = @counter1 + 1;
SET @counter1 = @counter1 + 1; END' at line 4
END' at line 3
delete from tb3 where f122='Test 3.5.8.5-while'; delete from tb3 where f122='Test 3.5.8.5-while';
drop trigger trg7; drop trigger trg7;
......
mysql-test/suite/funcs_1/r/ndb_trig_09.result
View file @ 805511a3
...@@ -65,7 +65,7 @@ Warnings: ...@@ -65,7 +65,7 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
Error 1466 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK' Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ; load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
Testcase 3.5.9.1/2: Testcase 3.5.9.1/2:
......
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result
View file @ 805511a3
...@@ -65,7 +65,7 @@ Warnings: ...@@ -65,7 +65,7 @@ Warnings:
Note 1265 Data truncated for column 'f150' at row 1 Note 1265 Data truncated for column 'f150' at row 1
Note 1265 Data truncated for column 'f151' at row 1 Note 1265 Data truncated for column 'f151' at row 1
Note 1265 Data truncated for column 'f152' at row 1 Note 1265 Data truncated for column 'f152' at row 1
Error 1466 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK' Error 1475 Table storage engine 'ndbcluster' does not support the create option 'Binlog of table with BLOB attribute and no PK'
load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ; load data infile 'MYSQL_TEST_DIR/suite/funcs_1/data/ndb_tb3.txt' into table tb3 ;
Testcase 3.5.10.1/2/3: Testcase 3.5.10.1/2/3:
......
mysql-test/suite/funcs_1/r/ndb_views.result
View file @ 805511a3
This source diff could not be displayed because it is too large. You can view the blob instead.
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
View file @ 805511a3
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
let $message= Section 3.1.6 - Privilege Checks:; let $message= Section 3.1.6 - Privilege Checks:;
--source include/show_msg80.inc --source include/show_msg80.inc
USE db_storedproc_1;
connection default; connection default;
USE db_storedproc_1;
--source suite/funcs_1/include/show_connection.inc --source suite/funcs_1/include/show_connection.inc
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
...@@ -58,6 +58,7 @@ disconnect user1a; ...@@ -58,6 +58,7 @@ disconnect user1a;
# add privilege again and check # add privilege again and check
connection default; connection default;
USE db_storedproc_1;
--source suite/funcs_1/include/show_connection.inc --source suite/funcs_1/include/show_connection.inc
GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost'; GRANT CREATE ROUTINE ON db_storedproc_1.* TO 'user_1'@'localhost';
...@@ -77,6 +78,7 @@ disconnect user1b; ...@@ -77,6 +78,7 @@ disconnect user1b;
# cleanup # cleanup
connection default; connection default;
USE db_storedproc_1;
--source suite/funcs_1/include/show_connection.inc --source suite/funcs_1/include/show_connection.inc
DROP USER 'user_1'@'localhost'; DROP USER 'user_1'@'localhost';
...@@ -132,6 +134,7 @@ disconnect user2; ...@@ -132,6 +134,7 @@ disconnect user2;
# cleanup # cleanup
connection default; connection default;
USE db_storedproc_1;
--source suite/funcs_1/include/show_connection.inc --source suite/funcs_1/include/show_connection.inc
drop user 'user_1'@'localhost'; drop user 'user_1'@'localhost';
......
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc
View file @ 805511a3
...@@ -21,7 +21,6 @@ let $message= Section 3.1.10 - CALL checks:; ...@@ -21,7 +21,6 @@ let $message= Section 3.1.10 - CALL checks:;
--source include/show_msg80.inc --source include/show_msg80.inc
USE db_storedproc;
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
let $message= Testcase 3.1.10.2 + 3.1.10.5:; let $message= Testcase 3.1.10.2 + 3.1.10.5:;
...@@ -80,6 +79,7 @@ SELECT fn31105( 9 ); ...@@ -80,6 +79,7 @@ SELECT fn31105( 9 );
# now 'add' EXECUTE to INVOKER # now 'add' EXECUTE to INVOKER
connection default; connection default;
USE db_storedproc;
--source suite/funcs_1/include/show_connection.inc --source suite/funcs_1/include/show_connection.inc
# root can execute ... # root can execute ...
CALL sp31102(); CALL sp31102();
...@@ -98,6 +98,7 @@ disconnect user2_3; ...@@ -98,6 +98,7 @@ disconnect user2_3;
# now 'remove' SELECT from INVOKER # now 'remove' SELECT from INVOKER
connection default; connection default;
USE db_storedproc;
--source suite/funcs_1/include/show_connection.inc --source suite/funcs_1/include/show_connection.inc
REVOKE EXECUTE ON db_storedproc.* FROM 'user_2'@'localhost'; REVOKE EXECUTE ON db_storedproc.* FROM 'user_2'@'localhost';
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
...@@ -115,6 +116,7 @@ disconnect user2_4; ...@@ -115,6 +116,7 @@ disconnect user2_4;
# cleanup # cleanup
connection default; connection default;
USE db_storedproc;
--source suite/funcs_1/include/show_connection.inc --source suite/funcs_1/include/show_connection.inc
DROP PROCEDURE sp31102; DROP PROCEDURE sp31102;
......
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