List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:July 9 2010 12:56pm
Subject:bzr push into mysql-trunk branch (Georgi.Kodinov:3106 to 3108) Bug#53095
View as plain text  
 3108 Georgi Kodinov	2010-07-09
      Addendum #3 to bug #53095 : fixed the wrong mysql-trunk tests.

    modified:
      mysql-test/r/information_schema_parameters.result
      mysql-test/r/information_schema_routines.result
 3107 Georgi Kodinov	2010-07-09 [merge]
      merge

    modified:
      mysql-test/suite/funcs_1/r/is_basics_mixed.result
 3106 Davi Arnaut	2010-07-09 [merge]
      Merge of mysql-5.1-bugteam into mysql-trunk-merge.

    added:
      config/ac-macros/maintainer.m4
    modified:
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      configure.in
      include/my_global.h
      plugin/daemon_example/Makefile.am
      plugin/semisync/Makefile.am
      sql-common/my_time.c
      sql/field.cc
      sql/item_timefunc.cc
      sql/log_event.cc
      sql/my_decimal.cc
      sql/mysqld.cc
      sql/partition_info.cc
      sql/protocol.cc
      sql/rpl_mi.cc
      sql/slave.cc
      sql/sql_acl.cc
      sql/sql_analyse.cc
      sql/sql_yacc.yy
      storage/archive/Makefile.am
      storage/blackhole/Makefile.am
      storage/csv/Makefile.am
      storage/example/Makefile.am
      storage/federated/Makefile.am
      storage/federated/ha_federated.cc
      storage/ibmdb2i/Makefile.am
      storage/innobase/Makefile.am
      tests/mysql_client_test.c
=== modified file 'mysql-test/r/information_schema_parameters.result'
--- a/mysql-test/r/information_schema_parameters.result	2010-01-15 11:42:15 +0000
+++ b/mysql-test/r/information_schema_parameters.result	2010-07-09 12:55:13 +0000
@@ -25,7 +25,7 @@ WHERE table_schema = 'information_schema
 ORDER BY ordinal_position;
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	SPECIFIC_CATALOG
 ORDINAL_POSITION	1
 COLUMN_DEFAULT	
@@ -44,7 +44,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	SPECIFIC_SCHEMA
 ORDINAL_POSITION	2
 COLUMN_DEFAULT	
@@ -63,7 +63,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	SPECIFIC_NAME
 ORDINAL_POSITION	3
 COLUMN_DEFAULT	
@@ -82,7 +82,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	ORDINAL_POSITION
 ORDINAL_POSITION	4
 COLUMN_DEFAULT	0
@@ -101,7 +101,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	PARAMETER_MODE
 ORDINAL_POSITION	5
 COLUMN_DEFAULT	NULL
@@ -120,7 +120,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	PARAMETER_NAME
 ORDINAL_POSITION	6
 COLUMN_DEFAULT	NULL
@@ -139,7 +139,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	DATA_TYPE
 ORDINAL_POSITION	7
 COLUMN_DEFAULT	
@@ -158,7 +158,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	CHARACTER_MAXIMUM_LENGTH
 ORDINAL_POSITION	8
 COLUMN_DEFAULT	NULL
@@ -177,7 +177,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	CHARACTER_OCTET_LENGTH
 ORDINAL_POSITION	9
 COLUMN_DEFAULT	NULL
@@ -196,7 +196,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	NUMERIC_PRECISION
 ORDINAL_POSITION	10
 COLUMN_DEFAULT	NULL
@@ -215,7 +215,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	NUMERIC_SCALE
 ORDINAL_POSITION	11
 COLUMN_DEFAULT	NULL
@@ -234,7 +234,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	CHARACTER_SET_NAME
 ORDINAL_POSITION	12
 COLUMN_DEFAULT	NULL
@@ -253,7 +253,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	COLLATION_NAME
 ORDINAL_POSITION	13
 COLUMN_DEFAULT	NULL
@@ -272,7 +272,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	DTD_IDENTIFIER
 ORDINAL_POSITION	14
 COLUMN_DEFAULT	NULL
@@ -291,7 +291,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	parameters
+TABLE_NAME	PARAMETERS
 COLUMN_NAME	ROUTINE_TYPE
 ORDINAL_POSITION	15
 COLUMN_DEFAULT	

=== modified file 'mysql-test/r/information_schema_routines.result'
--- a/mysql-test/r/information_schema_routines.result	2010-01-15 11:42:15 +0000
+++ b/mysql-test/r/information_schema_routines.result	2010-07-09 12:55:13 +0000
@@ -40,7 +40,7 @@ WHERE table_schema = 'information_schema
 ORDER BY ordinal_position;
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	SPECIFIC_NAME
 ORDINAL_POSITION	1
 COLUMN_DEFAULT	
@@ -59,7 +59,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_CATALOG
 ORDINAL_POSITION	2
 COLUMN_DEFAULT	
@@ -78,7 +78,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_SCHEMA
 ORDINAL_POSITION	3
 COLUMN_DEFAULT	
@@ -97,7 +97,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_NAME
 ORDINAL_POSITION	4
 COLUMN_DEFAULT	
@@ -116,7 +116,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_TYPE
 ORDINAL_POSITION	5
 COLUMN_DEFAULT	
@@ -135,7 +135,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	DATA_TYPE
 ORDINAL_POSITION	6
 COLUMN_DEFAULT	
@@ -154,7 +154,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	CHARACTER_MAXIMUM_LENGTH
 ORDINAL_POSITION	7
 COLUMN_DEFAULT	NULL
@@ -173,7 +173,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	CHARACTER_OCTET_LENGTH
 ORDINAL_POSITION	8
 COLUMN_DEFAULT	NULL
@@ -192,7 +192,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	NUMERIC_PRECISION
 ORDINAL_POSITION	9
 COLUMN_DEFAULT	NULL
@@ -211,7 +211,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	NUMERIC_SCALE
 ORDINAL_POSITION	10
 COLUMN_DEFAULT	NULL
@@ -230,7 +230,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	CHARACTER_SET_NAME
 ORDINAL_POSITION	11
 COLUMN_DEFAULT	NULL
@@ -249,7 +249,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	COLLATION_NAME
 ORDINAL_POSITION	12
 COLUMN_DEFAULT	NULL
@@ -268,7 +268,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	DTD_IDENTIFIER
 ORDINAL_POSITION	13
 COLUMN_DEFAULT	NULL
@@ -287,7 +287,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_BODY
 ORDINAL_POSITION	14
 COLUMN_DEFAULT	
@@ -306,7 +306,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_DEFINITION
 ORDINAL_POSITION	15
 COLUMN_DEFAULT	NULL
@@ -325,7 +325,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	EXTERNAL_NAME
 ORDINAL_POSITION	16
 COLUMN_DEFAULT	NULL
@@ -344,7 +344,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	EXTERNAL_LANGUAGE
 ORDINAL_POSITION	17
 COLUMN_DEFAULT	NULL
@@ -363,7 +363,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	PARAMETER_STYLE
 ORDINAL_POSITION	18
 COLUMN_DEFAULT	
@@ -382,7 +382,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	IS_DETERMINISTIC
 ORDINAL_POSITION	19
 COLUMN_DEFAULT	
@@ -401,7 +401,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	SQL_DATA_ACCESS
 ORDINAL_POSITION	20
 COLUMN_DEFAULT	
@@ -420,7 +420,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	SQL_PATH
 ORDINAL_POSITION	21
 COLUMN_DEFAULT	NULL
@@ -439,7 +439,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	SECURITY_TYPE
 ORDINAL_POSITION	22
 COLUMN_DEFAULT	
@@ -458,7 +458,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	CREATED
 ORDINAL_POSITION	23
 COLUMN_DEFAULT	0000-00-00 00:00:00
@@ -477,7 +477,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	LAST_ALTERED
 ORDINAL_POSITION	24
 COLUMN_DEFAULT	0000-00-00 00:00:00
@@ -496,7 +496,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	SQL_MODE
 ORDINAL_POSITION	25
 COLUMN_DEFAULT	
@@ -515,7 +515,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	ROUTINE_COMMENT
 ORDINAL_POSITION	26
 COLUMN_DEFAULT	NULL
@@ -534,7 +534,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	DEFINER
 ORDINAL_POSITION	27
 COLUMN_DEFAULT	
@@ -553,7 +553,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	CHARACTER_SET_CLIENT
 ORDINAL_POSITION	28
 COLUMN_DEFAULT	
@@ -572,7 +572,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	COLLATION_CONNECTION
 ORDINAL_POSITION	29
 COLUMN_DEFAULT	
@@ -591,7 +591,7 @@ PRIVILEGES	#
 COLUMN_COMMENT	
 TABLE_CATALOG	def
 TABLE_SCHEMA	information_schema
-TABLE_NAME	routines
+TABLE_NAME	ROUTINES
 COLUMN_NAME	DATABASE_COLLATION
 ORDINAL_POSITION	30
 COLUMN_DEFAULT	

=== modified file 'mysql-test/suite/funcs_1/r/is_basics_mixed.result'
--- a/mysql-test/suite/funcs_1/r/is_basics_mixed.result	2009-10-23 06:56:30 +0000
+++ b/mysql-test/suite/funcs_1/r/is_basics_mixed.result	2010-07-09 12:40:38 +0000
@@ -328,7 +328,7 @@ ERROR 42000: Access denied for user 'roo
 SELECT table_schema,table_name FROM information_schema.tables
 WHERE table_schema = 'information_schema' AND table_name = 'tables';
 table_schema	table_name
-information_schema	tables
+information_schema	TABLES
 SELECT * FROM information_schema.table_privileges
 WHERE table_schema = 'information_schema';
 GRANTEE	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	PRIVILEGE_TYPE	IS_GRANTABLE


Attachment: [text/bzr-bundle] bzr/georgi.kodinov@oracle.com-20100709125513-z0rx8z077p1jn7t5.bundle
Thread
bzr push into mysql-trunk branch (Georgi.Kodinov:3106 to 3108) Bug#53095Georgi Kodinov9 Jul