Below is the list of changes that have just been committed into a local
6.0 repository of istruewing. When istruewing does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2007-12-12 11:46:17+01:00, istruewing@stripped +4 -0
WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES
and PARAMETERS Views
Post-merge fix. Embedded server does not display privileges.
mysql-test/r/information_schema_parameters.result@stripped, 2007-12-12 11:46:15+01:00, istruewing@stripped +294 -15
WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES
and PARAMETERS Views
Post-merge fix. Embedded server does not display privileges.
mysql-test/r/information_schema_routines.result@stripped, 2007-12-12 11:46:15+01:00, istruewing@stripped +630 -31
WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES
and PARAMETERS Views
Post-merge fix. Embedded server does not display privileges.
mysql-test/t/information_schema_parameters.test@stripped, 2007-12-12 11:46:15+01:00, istruewing@stripped +3 -1
WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES
and PARAMETERS Views
Post-merge fix. Embedded server does not display privileges.
mysql-test/t/information_schema_routines.test@stripped, 2007-12-12 11:46:15+01:00, istruewing@stripped +3 -1
WL#2822 and WL#2003 -- Changes to INFORMATION_SCHEMA ROUTINES
and PARAMETERS Views
Post-merge fix. Embedded server does not display privileges.
diff -Nrup a/mysql-test/r/information_schema_parameters.result b/mysql-test/r/information_schema_parameters.result
--- a/mysql-test/r/information_schema_parameters.result 2007-12-06 21:40:03 +01:00
+++ b/mysql-test/r/information_schema_parameters.result 2007-12-12 11:46:15 +01:00
@@ -22,21 +22,300 @@ SELECT * FROM information_schema.columns
WHERE table_schema = 'information_schema'
AND table_name = 'parameters'
ORDER BY ordinal_position;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT STORAGE FORMAT
-NULL information_schema parameters SPECIFIC_CATALOG 1 NULL YES varchar 512 2048 NULL NULL utf8 utf8_general_ci varchar(512) select Default Default
-NULL information_schema parameters SPECIFIC_SCHEMA 2 NO varchar 256 1024 NULL NULL utf8 utf8_general_ci varchar(256) select Default Default
-NULL information_schema parameters SPECIFIC_NAME 3 NO varchar 256 1024 NULL NULL utf8 utf8_general_ci varchar(256) select Default Default
-NULL information_schema parameters ORDINAL_POSITION 4 0 NO int NULL NULL 10 0 NULL NULL int(21) select Default Default
-NULL information_schema parameters PARAMETER_MODE 5 NULL YES varchar 5 20 NULL NULL utf8 utf8_general_ci varchar(5) select Default Default
-NULL information_schema parameters PARAMETER_NAME 6 NULL YES varchar 256 1024 NULL NULL utf8 utf8_general_ci varchar(256) select Default Default
-NULL information_schema parameters DATA_TYPE 7 NO varchar 256 1024 NULL NULL utf8 utf8_general_ci varchar(256) select Default Default
-NULL information_schema parameters CHARACTER_MAXIMUM_LENGTH 8 NULL YES int NULL NULL 10 0 NULL NULL int(21) select Default Default
-NULL information_schema parameters CHARACTER_OCTET_LENGTH 9 NULL YES int NULL NULL 10 0 NULL NULL int(21) select Default Default
-NULL information_schema parameters NUMERIC_PRECISION 10 NULL YES int NULL NULL 10 0 NULL NULL int(21) select Default Default
-NULL information_schema parameters NUMERIC_SCALE 11 NULL YES int NULL NULL 10 0 NULL NULL int(21) select Default Default
-NULL information_schema parameters CHARACTER_SET_NAME 12 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema parameters COLLATION_NAME 13 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema parameters DTD_IDENTIFIER 14 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME SPECIFIC_CATALOG
+ORDINAL_POSITION 1
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 512
+CHARACTER_OCTET_LENGTH 2048
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(512)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME SPECIFIC_SCHEMA
+ORDINAL_POSITION 2
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 256
+CHARACTER_OCTET_LENGTH 1024
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(256)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME SPECIFIC_NAME
+ORDINAL_POSITION 3
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 256
+CHARACTER_OCTET_LENGTH 1024
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(256)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME ORDINAL_POSITION
+ORDINAL_POSITION 4
+COLUMN_DEFAULT 0
+IS_NULLABLE NO
+DATA_TYPE int
+CHARACTER_MAXIMUM_LENGTH NULL
+CHARACTER_OCTET_LENGTH NULL
+NUMERIC_PRECISION 10
+NUMERIC_SCALE 0
+CHARACTER_SET_NAME NULL
+COLLATION_NAME NULL
+COLUMN_TYPE int(21)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME PARAMETER_MODE
+ORDINAL_POSITION 5
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 5
+CHARACTER_OCTET_LENGTH 20
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(5)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME PARAMETER_NAME
+ORDINAL_POSITION 6
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 256
+CHARACTER_OCTET_LENGTH 1024
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(256)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME DATA_TYPE
+ORDINAL_POSITION 7
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 256
+CHARACTER_OCTET_LENGTH 1024
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(256)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME CHARACTER_MAXIMUM_LENGTH
+ORDINAL_POSITION 8
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE int
+CHARACTER_MAXIMUM_LENGTH NULL
+CHARACTER_OCTET_LENGTH NULL
+NUMERIC_PRECISION 10
+NUMERIC_SCALE 0
+CHARACTER_SET_NAME NULL
+COLLATION_NAME NULL
+COLUMN_TYPE int(21)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME CHARACTER_OCTET_LENGTH
+ORDINAL_POSITION 9
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE int
+CHARACTER_MAXIMUM_LENGTH NULL
+CHARACTER_OCTET_LENGTH NULL
+NUMERIC_PRECISION 10
+NUMERIC_SCALE 0
+CHARACTER_SET_NAME NULL
+COLLATION_NAME NULL
+COLUMN_TYPE int(21)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME NUMERIC_PRECISION
+ORDINAL_POSITION 10
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE int
+CHARACTER_MAXIMUM_LENGTH NULL
+CHARACTER_OCTET_LENGTH NULL
+NUMERIC_PRECISION 10
+NUMERIC_SCALE 0
+CHARACTER_SET_NAME NULL
+COLLATION_NAME NULL
+COLUMN_TYPE int(21)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME NUMERIC_SCALE
+ORDINAL_POSITION 11
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE int
+CHARACTER_MAXIMUM_LENGTH NULL
+CHARACTER_OCTET_LENGTH NULL
+NUMERIC_PRECISION 10
+NUMERIC_SCALE 0
+CHARACTER_SET_NAME NULL
+COLLATION_NAME NULL
+COLUMN_TYPE int(21)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME CHARACTER_SET_NAME
+ORDINAL_POSITION 12
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME COLLATION_NAME
+ORDINAL_POSITION 13
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME parameters
+COLUMN_NAME DTD_IDENTIFIER
+ORDINAL_POSITION 14
+COLUMN_DEFAULT NULL
+IS_NULLABLE NO
+DATA_TYPE longtext
+CHARACTER_MAXIMUM_LENGTH 4294967295
+CHARACTER_OCTET_LENGTH 4294967295
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE longtext
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
DESCRIBE INFORMATION_SCHEMA.PARAMETERS;
Field Type Null Key Default Extra
SPECIFIC_CATALOG varchar(512) YES NULL
diff -Nrup a/mysql-test/r/information_schema_routines.result b/mysql-test/r/information_schema_routines.result
--- a/mysql-test/r/information_schema_routines.result 2007-12-06 21:40:04 +01:00
+++ b/mysql-test/r/information_schema_routines.result 2007-12-12 11:46:15 +01:00
@@ -38,37 +38,636 @@ SELECT * FROM information_schema.columns
WHERE table_schema = 'information_schema'
AND table_name = 'routines'
ORDER BY ordinal_position;
-TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT STORAGE FORMAT
-NULL information_schema routines SPECIFIC_NAME 1 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema routines ROUTINE_CATALOG 2 NULL YES varchar 512 2048 NULL NULL utf8 utf8_general_ci varchar(512) select Default Default
-NULL information_schema routines ROUTINE_SCHEMA 3 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema routines ROUTINE_NAME 4 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema routines ROUTINE_TYPE 5 NO varchar 9 36 NULL NULL utf8 utf8_general_ci varchar(9) select Default Default
-NULL information_schema routines DATA_TYPE 6 NO varchar 256 1024 NULL NULL utf8 utf8_general_ci varchar(256) select Default Default
-NULL information_schema routines CHARACTER_MAXIMUM_LENGTH 7 NULL YES int NULL NULL 10 0 NULL NULL int(21) select Default Default
-NULL information_schema routines CHARACTER_OCTET_LENGTH 8 NULL YES int NULL NULL 10 0 NULL NULL int(21) select Default Default
-NULL information_schema routines NUMERIC_PRECISION 9 NULL YES int NULL NULL 10 0 NULL NULL int(21) select Default Default
-NULL information_schema routines NUMERIC_SCALE 10 NULL YES int NULL NULL 10 0 NULL NULL int(21) select Default Default
-NULL information_schema routines CHARACTER_SET_NAME 11 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema routines COLLATION_NAME 12 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema routines DTD_IDENTIFIER 13 NULL YES longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
-NULL information_schema routines ROUTINE_BODY 14 NO varchar 8 32 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
-NULL information_schema routines ROUTINE_DEFINITION 15 NULL YES longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
-NULL information_schema routines EXTERNAL_NAME 16 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema routines EXTERNAL_LANGUAGE 17 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema routines PARAMETER_STYLE 18 NO varchar 8 32 NULL NULL utf8 utf8_general_ci varchar(8) select Default Default
-NULL information_schema routines IS_DETERMINISTIC 19 NO varchar 3 12 NULL NULL utf8 utf8_general_ci varchar(3) select Default Default
-NULL information_schema routines SQL_DATA_ACCESS 20 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema routines SQL_PATH 21 NULL YES varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema routines SECURITY_TYPE 22 NO varchar 7 28 NULL NULL utf8 utf8_general_ci varchar(7) select Default Default
-NULL information_schema routines CREATED 23 0000-00-00 00:00:00 NO datetime NULL NULL NULL NULL NULL NULL datetime select Default Default
-NULL information_schema routines LAST_ALTERED 24 0000-00-00 00:00:00 NO datetime NULL NULL NULL NULL NULL NULL datetime select Default Default
-NULL information_schema routines SQL_MODE 25 NULL NO longtext 4294967295 4294967295 NULL NULL utf8 utf8_general_ci longtext select Default Default
-NULL information_schema routines ROUTINE_COMMENT 26 NO varchar 64 256 NULL NULL utf8 utf8_general_ci varchar(64) select Default Default
-NULL information_schema routines DEFINER 27 NO varchar 77 308 NULL NULL utf8 utf8_general_ci varchar(77) select Default Default
-NULL information_schema routines CHARACTER_SET_CLIENT 28 NO varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
-NULL information_schema routines COLLATION_CONNECTION 29 NO varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
-NULL information_schema routines DATABASE_COLLATION 30 NO varchar 32 128 NULL NULL utf8 utf8_general_ci varchar(32) select Default Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME SPECIFIC_NAME
+ORDINAL_POSITION 1
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME ROUTINE_CATALOG
+ORDINAL_POSITION 2
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 512
+CHARACTER_OCTET_LENGTH 2048
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(512)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME ROUTINE_SCHEMA
+ORDINAL_POSITION 3
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME ROUTINE_NAME
+ORDINAL_POSITION 4
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME ROUTINE_TYPE
+ORDINAL_POSITION 5
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 9
+CHARACTER_OCTET_LENGTH 36
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(9)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME DATA_TYPE
+ORDINAL_POSITION 6
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 256
+CHARACTER_OCTET_LENGTH 1024
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(256)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME CHARACTER_MAXIMUM_LENGTH
+ORDINAL_POSITION 7
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE int
+CHARACTER_MAXIMUM_LENGTH NULL
+CHARACTER_OCTET_LENGTH NULL
+NUMERIC_PRECISION 10
+NUMERIC_SCALE 0
+CHARACTER_SET_NAME NULL
+COLLATION_NAME NULL
+COLUMN_TYPE int(21)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME CHARACTER_OCTET_LENGTH
+ORDINAL_POSITION 8
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE int
+CHARACTER_MAXIMUM_LENGTH NULL
+CHARACTER_OCTET_LENGTH NULL
+NUMERIC_PRECISION 10
+NUMERIC_SCALE 0
+CHARACTER_SET_NAME NULL
+COLLATION_NAME NULL
+COLUMN_TYPE int(21)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME NUMERIC_PRECISION
+ORDINAL_POSITION 9
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE int
+CHARACTER_MAXIMUM_LENGTH NULL
+CHARACTER_OCTET_LENGTH NULL
+NUMERIC_PRECISION 10
+NUMERIC_SCALE 0
+CHARACTER_SET_NAME NULL
+COLLATION_NAME NULL
+COLUMN_TYPE int(21)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME NUMERIC_SCALE
+ORDINAL_POSITION 10
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE int
+CHARACTER_MAXIMUM_LENGTH NULL
+CHARACTER_OCTET_LENGTH NULL
+NUMERIC_PRECISION 10
+NUMERIC_SCALE 0
+CHARACTER_SET_NAME NULL
+COLLATION_NAME NULL
+COLUMN_TYPE int(21)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME CHARACTER_SET_NAME
+ORDINAL_POSITION 11
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME COLLATION_NAME
+ORDINAL_POSITION 12
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME DTD_IDENTIFIER
+ORDINAL_POSITION 13
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE longtext
+CHARACTER_MAXIMUM_LENGTH 4294967295
+CHARACTER_OCTET_LENGTH 4294967295
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE longtext
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME ROUTINE_BODY
+ORDINAL_POSITION 14
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 8
+CHARACTER_OCTET_LENGTH 32
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(8)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME ROUTINE_DEFINITION
+ORDINAL_POSITION 15
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE longtext
+CHARACTER_MAXIMUM_LENGTH 4294967295
+CHARACTER_OCTET_LENGTH 4294967295
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE longtext
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME EXTERNAL_NAME
+ORDINAL_POSITION 16
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME EXTERNAL_LANGUAGE
+ORDINAL_POSITION 17
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME PARAMETER_STYLE
+ORDINAL_POSITION 18
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 8
+CHARACTER_OCTET_LENGTH 32
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(8)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME IS_DETERMINISTIC
+ORDINAL_POSITION 19
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 3
+CHARACTER_OCTET_LENGTH 12
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(3)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME SQL_DATA_ACCESS
+ORDINAL_POSITION 20
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME SQL_PATH
+ORDINAL_POSITION 21
+COLUMN_DEFAULT NULL
+IS_NULLABLE YES
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME SECURITY_TYPE
+ORDINAL_POSITION 22
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 7
+CHARACTER_OCTET_LENGTH 28
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(7)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME CREATED
+ORDINAL_POSITION 23
+COLUMN_DEFAULT 0000-00-00 00:00:00
+IS_NULLABLE NO
+DATA_TYPE datetime
+CHARACTER_MAXIMUM_LENGTH NULL
+CHARACTER_OCTET_LENGTH NULL
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME NULL
+COLLATION_NAME NULL
+COLUMN_TYPE datetime
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME LAST_ALTERED
+ORDINAL_POSITION 24
+COLUMN_DEFAULT 0000-00-00 00:00:00
+IS_NULLABLE NO
+DATA_TYPE datetime
+CHARACTER_MAXIMUM_LENGTH NULL
+CHARACTER_OCTET_LENGTH NULL
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME NULL
+COLLATION_NAME NULL
+COLUMN_TYPE datetime
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME SQL_MODE
+ORDINAL_POSITION 25
+COLUMN_DEFAULT NULL
+IS_NULLABLE NO
+DATA_TYPE longtext
+CHARACTER_MAXIMUM_LENGTH 4294967295
+CHARACTER_OCTET_LENGTH 4294967295
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE longtext
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME ROUTINE_COMMENT
+ORDINAL_POSITION 26
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 64
+CHARACTER_OCTET_LENGTH 256
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(64)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME DEFINER
+ORDINAL_POSITION 27
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 77
+CHARACTER_OCTET_LENGTH 308
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(77)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME CHARACTER_SET_CLIENT
+ORDINAL_POSITION 28
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 32
+CHARACTER_OCTET_LENGTH 128
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(32)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME COLLATION_CONNECTION
+ORDINAL_POSITION 29
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 32
+CHARACTER_OCTET_LENGTH 128
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(32)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
+TABLE_CATALOG NULL
+TABLE_SCHEMA information_schema
+TABLE_NAME routines
+COLUMN_NAME DATABASE_COLLATION
+ORDINAL_POSITION 30
+COLUMN_DEFAULT
+IS_NULLABLE NO
+DATA_TYPE varchar
+CHARACTER_MAXIMUM_LENGTH 32
+CHARACTER_OCTET_LENGTH 128
+NUMERIC_PRECISION NULL
+NUMERIC_SCALE NULL
+CHARACTER_SET_NAME utf8
+COLLATION_NAME utf8_general_ci
+COLUMN_TYPE varchar(32)
+COLUMN_KEY
+EXTRA
+PRIVILEGES #
+COLUMN_COMMENT
+STORAGE Default
+FORMAT Default
DESCRIBE INFORMATION_SCHEMA.ROUTINES;
Field Type Null Key Default Extra
SPECIFIC_NAME varchar(64) NO
diff -Nrup a/mysql-test/t/information_schema_parameters.test b/mysql-test/t/information_schema_parameters.test
--- a/mysql-test/t/information_schema_parameters.test 2007-12-06 15:54:59 +01:00
+++ b/mysql-test/t/information_schema_parameters.test 2007-12-12 11:46:15 +01:00
@@ -30,7 +30,9 @@
USE INFORMATION_SCHEMA;
SHOW CREATE TABLE INFORMATION_SCHEMA.PARAMETERS;
-SELECT * FROM information_schema.columns
+# embedded server does not display privileges
+--replace_column 18 #
+query_vertical SELECT * FROM information_schema.columns
WHERE table_schema = 'information_schema'
AND table_name = 'parameters'
ORDER BY ordinal_position;
diff -Nrup a/mysql-test/t/information_schema_routines.test b/mysql-test/t/information_schema_routines.test
--- a/mysql-test/t/information_schema_routines.test 2007-12-06 15:54:59 +01:00
+++ b/mysql-test/t/information_schema_routines.test 2007-12-12 11:46:15 +01:00
@@ -58,7 +58,9 @@
USE INFORMATION_SCHEMA;
SHOW CREATE TABLE INFORMATION_SCHEMA.ROUTINES;
-SELECT * FROM information_schema.columns
+# embedded server does not display privileges
+--replace_column 18 #
+query_vertical SELECT * FROM information_schema.columns
WHERE table_schema = 'information_schema'
AND table_name = 'routines'
ORDER BY ordinal_position;
| Thread |
|---|
| • bk commit into 6.0 tree (istruewing:1.2757) WL#2822 | Ingo Struewing | 12 Dec |
