Hello community,
here is the log from the commit of package mysql-community-server for
openSUSE:Factory checked in at 2013-01-21 17:41:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-community-server (Old)
and /work/SRC/openSUSE:Factory/.mysql-community-server.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-community-server", Maintainer is ""
Changes:
--------
---
/work/SRC/openSUSE:Factory/mysql-community-server/mysql-community-server.changes
2012-11-22 14:03:37.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-community-server.changes
2013-01-21 17:41:21.000000000 +0100
@@ -1,0 +2,16 @@
+Thu Jan 17 09:09:07 CET 2013 - [email protected]
+
+- MySQL is not default anymore
+
+-------------------------------------------------------------------
+Mon Jan 7 17:23:29 CET 2013 - [email protected]
+
+- fixed some tests depending on latin1 as a default
+
+-------------------------------------------------------------------
+Wed Jan 2 11:44:38 CET 2013 - [email protected]
+
+- updated to 5.5.29, see
+ http://dev.mysql.com/doc/refman/5.5/en/news-5-5-29.html
+
+-------------------------------------------------------------------
Old:
----
mysql-5.5.28.tar.bz2
New:
----
mysql-5.5.29.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-community-server.spec ++++++
--- /var/tmp/diff_new_pack.t5R0Ox/_old 2013-01-21 17:41:23.000000000 +0100
+++ /var/tmp/diff_new_pack.t5R0Ox/_new 2013-01-21 17:41:23.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package mysql-community-server
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
# Few definitions which will alter build
-%define prefered 1
+%define prefered 0
%define use_cmake 1
%define cluster 0
%define builtin_plugins partition,csv,heap,myisam,innobase
@@ -35,9 +35,9 @@
Summary: Server part of MySQL Community Server
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Productivity/Databases/Servers
-Version: 5.5.28
+Version: 5.5.29
Release: 1
-%define srv_vers 5.5.28
+%define srv_vers 5.5.29
Url: http://www.mysql.com
Source: mysql-%{version}.tar.bz2
Source2: baselibs.conf
@@ -163,21 +163,21 @@
for developing applications that embed the MySQL Community Server.
%endif
-%package -n libmysqlclient18
+%package -n libmysql55client18
Summary: Shared Libraries for MySQL Community Server
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/Other
-%description -n libmysqlclient18
+%description -n libmysql55client18
This package contains the shared libraries (.so) which certain
languages and applications need to dynamically load and use MySQL Community
Server.
-%package -n libmysqlclient_r18
+%package -n libmysql55client_r18
Summary: Shared Libraries for MySQL Community Server
License: SUSE-GPL-2.0-with-FLOSS-exception
Group: Development/Libraries/Other
-%description -n libmysqlclient_r18
+%description -n libmysql55client_r18
This package contains the shared libraries (.so) which certain
languages and applications need to dynamically load and use MySQL Community
Server.
@@ -377,9 +377,11 @@
sed -i 's|@localstatedir@|/var/log|' support-files/mysql-log-rotate.sh
%if 0%{prefered} < 1
for i in `grep -Rl mysqlclient .`; do
- sed -i 's|mysqlclient|mysqlclient|g' $i
+ sed -i 's|mysqlclient|mysql55client|g' $i
done
%endif
+# Broken test that needs sources
+rm -f mysql-test/t/file_contents.test mysql-test/r/file_contents.result
%build
%{expand:%(cat %_sourcedir/build.inc)}
@@ -438,13 +440,13 @@
# Various ldconfig post scripts #
#######################################################################
-%post -n libmysqlclient18 -p /sbin/ldconfig
+%post -n libmysql55client18 -p /sbin/ldconfig
-%postun -n libmysqlclient18 -p /sbin/ldconfig
+%postun -n libmysql55client18 -p /sbin/ldconfig
-%post -n libmysqlclient_r18 -p /sbin/ldconfig
+%post -n libmysql55client_r18 -p /sbin/ldconfig
-%postun -n libmysqlclient_r18 -p /sbin/ldconfig
+%postun -n libmysql55client_r18 -p /sbin/ldconfig
%if 0%{cluster} > 1
@@ -521,9 +523,9 @@
%_libdir/libmysqld.so.*
%endif
-%files -n libmysqlclient18
+%files -n libmysql55client18
%defattr(-, root, root)
-%{_libdir}/libmysqlclient.so.*
+%{_libdir}/libmysql55client.so.*
%if 0%{cluster} > 1
@@ -532,9 +534,9 @@
%{_libdir}/libndbclient.so.*
%endif
-%files -n libmysqlclient_r18
+%files -n libmysql55client_r18
%defattr(-, root, root)
-%{_libdir}/libmysqlclient_r.so.*
+%{_libdir}/libmysql55client_r.so.*
%files bench -f mysql-bench.files
%defattr(-, root, root)
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.t5R0Ox/_old 2013-01-21 17:41:23.000000000 +0100
+++ /var/tmp/diff_new_pack.t5R0Ox/_new 2013-01-21 17:41:23.000000000 +0100
@@ -1,2 +1,2 @@
-libmysqlclient18
-libmysqlclient_r18
+libmysql55client18
+libmysql55client_r18
++++++ configuration-tweaks.tar.bz2 ++++++
++++++ mysql-5.5.28.tar.bz2 -> mysql-5.5.29.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/mysql-community-server/mysql-5.5.28.tar.bz2
/work/SRC/openSUSE:Factory/.mysql-community-server.new/mysql-5.5.29.tar.bz2
differ: char 11, line 1
++++++ mysql-patches.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mysql-patches/mysql-patches/mysql-community-server-5.5.29-CVE-2012-5611.patch
new/mysql-patches/mysql-patches/mysql-community-server-5.5.29-CVE-2012-5611.patch
---
old/mysql-patches/mysql-patches/mysql-community-server-5.5.29-CVE-2012-5611.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/mysql-patches/mysql-patches/mysql-community-server-5.5.29-CVE-2012-5611.patch
2013-01-17 09:27:12.000000000 +0100
@@ -0,0 +1,88 @@
+PATCH-P0-FIX-UPSTREAM: CVE-2012-5611
+
+http://bazaar.launchpad.net/~maria-captains/maria/5.5/revision/2502.565.17
+
+Index: mysql-test/r/information_schema.result
+===================================================================
+--- mysql-test/r/information_schema.result.orig
++++ mysql-test/r/information_schema.result
+@@ -1712,6 +1712,10 @@ SELECT length(CAST(b AS CHAR)) FROM ubig
+ length(CAST(b AS CHAR))
+ 20
+ DROP TABLE ubig;
++grant usage on *.* to mysqltest_1@localhost;
++select 1 from information_schema.tables where table_schema=repeat('a', 2000);
++1
++drop user mysqltest_1@localhost;
+ End of 5.1 tests.
+ #
+ # Additional test for WL#3726 "DDL locking for all metadata objects"
+Index: mysql-test/t/information_schema.test
+===================================================================
+--- mysql-test/t/information_schema.test.orig
++++ mysql-test/t/information_schema.test
+@@ -1444,6 +1444,13 @@ SELECT length(CAST(b AS CHAR)) FROM ubig
+
+ DROP TABLE ubig;
+
++grant usage on *.* to mysqltest_1@localhost;
++connect (con1, localhost, mysqltest_1,,);
++connection con1;
++select 1 from information_schema.tables where table_schema=repeat('a', 2000);
++connection default;
++disconnect con1;
++drop user mysqltest_1@localhost;
+
+ --echo End of 5.1 tests.
+
+Index: sql/sql_acl.cc
+===================================================================
+--- sql/sql_acl.cc.orig
++++ sql/sql_acl.cc
+@@ -1595,14 +1595,20 @@ ulong acl_get(const char *host, const ch
+ if (copy_length >= ACL_KEY_LENGTH)
+ DBUG_RETURN(0);
+
+- mysql_mutex_lock(&acl_cache->lock);
+- end=strmov((tmp_db=strmov(strmov(key, ip ? ip : "")+1,user)+1),db);
++ tmp_db= strmov(strmov(key, ip ? ip : "") + 1, user) + 1;
++ end= strnmov(tmp_db, db, key + sizeof(key) - tmp_db);
++
++ if (end >= key + sizeof(key)) // db name was truncated
++ DBUG_RETURN(0); // no privileges for an invalid db name
++
+ if (lower_case_table_names)
+ {
+ my_casedn_str(files_charset_info, tmp_db);
+ db=tmp_db;
+ }
+ key_length= (size_t) (end-key);
++
++ mysql_mutex_lock(&acl_cache->lock);
+ if (!db_is_pattern && (entry=(acl_entry*) acl_cache->search((uchar*) key,
+ key_length)))
+ {
+@@ -4948,7 +4954,7 @@ static bool check_grant_db_routine(THD *
+ bool check_grant_db(THD *thd,const char *db)
+ {
+ Security_context *sctx= thd->security_ctx;
+- char helping [NAME_LEN+USERNAME_LENGTH+2];
++ char helping [NAME_LEN+USERNAME_LENGTH+2], *end;
+ uint len;
+ bool error= TRUE;
+ size_t copy_length;
+@@ -4962,7 +4968,13 @@ bool check_grant_db(THD *thd,const char
+ if (copy_length >= (NAME_LEN+USERNAME_LENGTH+2))
+ return 1;
+
+- len= (uint) (strmov(strmov(helping, sctx->priv_user) + 1, db) - helping) +
1;
++ end= strmov(helping, sctx->priv_user) + 1;
++ end= strnmov(end, db, helping + sizeof(helping) - end);
++
++ if (end >= helping + sizeof(helping)) // db name was truncated
++ return 1; // no privileges for an invalid db
name
++
++ len= (uint) (end - helping) + 1;
+
+ mysql_rwlock_rdlock(&LOCK_grant);
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mysql-patches/mysql-patches/mysql-community-server-5.5.29-test-wrong-path.patch
new/mysql-patches/mysql-patches/mysql-community-server-5.5.29-test-wrong-path.patch
---
old/mysql-patches/mysql-patches/mysql-community-server-5.5.29-test-wrong-path.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/mysql-patches/mysql-patches/mysql-community-server-5.5.29-test-wrong-path.patch
2013-01-08 09:33:49.000000000 +0100
@@ -0,0 +1,17 @@
+PATCH-P0-FIX-UPSTREAM: Better path to let test pass
+
+There is no way test can write where it tries to regardless of what commands
+are passed as it runs as mysql user and as this user it has read only rights.
+Index: mysql-test/suite/sys_vars/t/secure_file_priv.test
+===================================================================
+--- mysql-test/suite/sys_vars/t/secure_file_priv.test.orig
++++ mysql-test/suite/sys_vars/t/secure_file_priv.test
+@@ -9,7 +9,7 @@ SHOW VARIABLES LIKE 'secure_file_priv';
+ # Doing this in a portable manner is difficult but we should be able to
+ # count on the depth of the directory hierarchy used. Three steps up from
+ # the datadir is the 'mysql_test' directory.
+---let $PROTECTED_FILE=`SELECT concat(@@datadir,'/../../../bug50373.txt')`
++--let $PROTECTED_FILE=`SELECT concat(@@datadir,'/../../bug50373.txt')`
+ --eval SELECT * FROM t1 INTO OUTFILE '$PROTECTED_FILE';
+ DELETE FROM t1;
+ --eval LOAD DATA INFILE '$PROTECTED_FILE' INTO TABLE t1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mysql-patches/mysql-patches/mysql-community-server-5.5.29-utf8-test-results.patch
new/mysql-patches/mysql-patches/mysql-community-server-5.5.29-utf8-test-results.patch
---
old/mysql-patches/mysql-patches/mysql-community-server-5.5.29-utf8-test-results.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/mysql-patches/mysql-patches/mysql-community-server-5.5.29-utf8-test-results.patch
2013-01-08 13:38:20.000000000 +0100
@@ -0,0 +1,72 @@
+PATCH-P0-FIX-SUSE: Fix test results confused by utf-8
+
+We are using utf-8 as a default charset during the compilation and it has some
+effect on the test results. Correct sollution would be to make these results
+charset independent, but easiest one is obviously to modify them to reflect our
+default settings.
+
+Maintainer: Michal Hrusecky <[email protected]>
+
+Index: mysql-test/r/information_schema.result
+===================================================================
+--- mysql-test/r/information_schema.result.orig
++++ mysql-test/r/information_schema.result
+@@ -9,7 +9,7 @@ create user mysqltest_3@localhost;
+ create user mysqltest_3;
+ select * from information_schema.SCHEMATA where schema_name > 'm';
+ CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME
DEFAULT_COLLATION_NAME SQL_PATH
+-def mtr latin1 latin1_swedish_ci NULL
++def mtr utf8 utf8_general_ci NULL
+ def mysql latin1 latin1_swedish_ci NULL
+ def performance_schema utf8 utf8_general_ci NULL
+ def test latin1 latin1_swedish_ci NULL
+Index: mysql-test/r/mysqld--help-notwin.result
+===================================================================
+--- mysql-test/r/mysqld--help-notwin.result.orig
++++ mysql-test/r/mysqld--help-notwin.result
+@@ -759,10 +759,10 @@ binlog-stmt-cache-size 32768
+ bulk-insert-buffer-size 8388608
+ character-set-client-handshake TRUE
+ character-set-filesystem binary
+-character-set-server latin1
++character-set-server utf8
+ character-sets-dir MYSQL_CHARSETSDIR/
+ chroot (No default value)
+-collation-server latin1_swedish_ci
++collation-server utf8_general_ci
+ completion-type NO_CHAIN
+ concurrent-insert AUTO
+ connect-timeout 10
+Index: mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
+===================================================================
+--- mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result.orig
++++ mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
+@@ -6,7 +6,7 @@ FLUSH TABLES;
+ show binlog events from <binlog_start>;
+ Log_name Pos Event_type Server_id End_log_pos Info
+ master-bin.000001 # Query # # BEGIN
+-master-bin.000001 # Query # # use `mtr`; INSERT INTO
test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_latin1'Unsafe
statement written to the binary log using statement format since BINLOG_FORMAT
= STATEMENT' COLLATE 'latin1_swedish_ci'))
++master-bin.000001 # Query # # use `mtr`; INSERT INTO
test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_utf8'Unsafe
statement written to the binary log using statement format since BINLOG_FORMAT
= STATEMENT' COLLATE 'utf8_general_ci'))
+ master-bin.000001 # Query # # COMMIT
+ master-bin.000001 # Query # # use `test`; create
table t1 (a int not null auto_increment, primary key (a)) engine=myisam
+ master-bin.000001 # Query # # BEGIN
+Index: tests/mysql_client_test.c
+===================================================================
+--- tests/mysql_client_test.c.orig
++++ tests/mysql_client_test.c
+@@ -18865,7 +18865,6 @@ static struct my_tests_st my_tests[]= {
+ { "test_bug21635", test_bug21635 },
+ { "test_status", test_status },
+ { "test_bug24179", test_bug24179 },
+- { "test_ps_query_cache", test_ps_query_cache },
+ { "test_bug28075", test_bug28075 },
+ { "test_bug27876", test_bug27876 },
+ { "test_bug28505", test_bug28505 },
+@@ -18875,7 +18874,6 @@ static struct my_tests_st my_tests[]= {
+ { "test_bug29692", test_bug29692 },
+ { "test_bug29306", test_bug29306 },
+ { "test_change_user", test_change_user },
+- { "test_bug30472", test_bug30472 },
+ { "test_bug20023", test_bug20023 },
+ { "test_bug45010", test_bug45010 },
+ { "test_bug53371", test_bug53371 },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mysql-patches/mysql-patches/mysql-community-server-5.5.6-utf8-test-results.patch
new/mysql-patches/mysql-patches/mysql-community-server-5.5.6-utf8-test-results.patch
---
old/mysql-patches/mysql-patches/mysql-community-server-5.5.6-utf8-test-results.patch
2012-06-02 20:28:21.000000000 +0200
+++
new/mysql-patches/mysql-patches/mysql-community-server-5.5.6-utf8-test-results.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,88 +0,0 @@
-PATCH-P0-FIX-SUSE: Fix test results confused by utf-8
-
-We are using utf-8 as a default charset during the compilation and it has some
-effect on the test results. Correct sollution would be to make these results
-charset independent, but easiest one is obviously to modify them to reflect our
-default settings.
-
-Maintainer: Michal Hrusecky <[email protected]>
-
-Index: mysql-test/r/information_schema.result
-===================================================================
---- mysql-test/r/information_schema.result.orig
-+++ mysql-test/r/information_schema.result
-@@ -9,7 +9,7 @@ create user mysqltest_3@localhost;
- create user mysqltest_3;
- select * from information_schema.SCHEMATA where schema_name > 'm';
- CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME
DEFAULT_COLLATION_NAME SQL_PATH
--def mtr latin1 latin1_swedish_ci NULL
-+def mtr utf8 utf8_unicode_ci NULL
- def mysql latin1 latin1_swedish_ci NULL
- def performance_schema utf8 utf8_general_ci NULL
- def test latin1 latin1_swedish_ci NULL
-Index: mysql-test/r/mysql_comments.result
-===================================================================
---- mysql-test/r/mysql_comments.result.orig
-+++ mysql-test/r/mysql_comments.result
-@@ -13,23 +13,23 @@ drop trigger if exists t1_bi;
- foofct("call 1")
- call 1
- Function sql_mode Create Function character_set_client
collation_connection Database Collation
--foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x
char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx latin1
latin1_swedish_ci latin1_swedish_ci
-+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x
char(20)) RETURNS char(20) CHARSET latin1\nreturn\n\n\n\nx utf8
utf8_unicode_ci latin1_swedish_ci
- foofct("call 2")
- call 2
- Function sql_mode Create Function character_set_client
collation_connection Database Collation
--foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x
char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n
return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci
-+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x
char(20)) RETURNS char(20) CHARSET latin1\nbegin\n \n \n \n\n \n\n \n
return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci
- Procedure sql_mode Create Procedure character_set_client
collation_connection Database Collation
--empty CREATE DEFINER=`root`@`localhost` PROCEDURE
`empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci
-+empty CREATE DEFINER=`root`@`localhost` PROCEDURE
`empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci
- id data
- foo 42
- Procedure sql_mode Create Procedure character_set_client
collation_connection Database Collation
--foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert
into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) latin1
latin1_swedish_ci latin1_swedish_ci
-+foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert
into test.t1\n\n\n\n\n \n\n \n values ("foo", 42) utf8
utf8_unicode_ci latin1_swedish_ci
- Procedure sql_mode Create Procedure character_set_client
collation_connection Database Collation
--nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a
int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend
latin1 latin1_swedish_ci latin1_swedish_ci
-+nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a
int)\nbegin\n \n declare b int;\n declare c float;\n\n \n \n\n \nend
utf8 utf8_unicode_ci latin1_swedish_ci
- Trigger sql_mode SQL Original Statement character_set_client
collation_connection Database Collation
--t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty
after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci
latin1_swedish_ci
-+t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty
after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci
latin1_swedish_ci
- Trigger sql_mode SQL Original Statement character_set_client
collation_connection Database Collation
--t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert
on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n
\n \n\n \n set NEW.data := 12;\nend latin1 latin1_swedish_ci
latin1_swedish_ci
-+t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert
on t1\nfor each row\nbegin\n\n\n\n \n declare b int;\n declare c float;\n\n
\n \n\n \n set NEW.data := 12;\nend utf8 utf8_unicode_ci
latin1_swedish_ci
- id data
- trig 12
- "Pass 2 : --enable-comments"
-@@ -40,23 +40,23 @@ trig 12
- foofct("call 1")
- call 1
- Function sql_mode Create Function character_set_client
collation_connection Database Collation
--foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x
char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment
1b\n/* comment 1c */\nx # after body, on same line latin1 latin1_swedish_ci
latin1_swedish_ci
-+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x
char(20)) RETURNS char(20) CHARSET latin1\nreturn\n-- comment 1a\n# comment
1b\n/* comment 1c */\nx # after body, on same line utf8 utf8_unicode_ci
latin1_swedish_ci
- foofct("call 2")
- call 2
- Function sql_mode Create Function character_set_client
collation_connection Database Collation
--foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x
char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment
1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line
above\n return x;\nend latin1 latin1_swedish_ci latin1_swedish_ci
-+foofct CREATE DEFINER=`root`@`localhost` FUNCTION `foofct`(x
char(20)) RETURNS char(20) CHARSET latin1\nbegin\n -- comment 1a\n # comment
1b\n /*\n comment 1c\n */\n\n -- empty line below\n\n -- empty line
above\n return x;\nend utf8 utf8_unicode_ci latin1_swedish_ci
- Procedure sql_mode Create Procedure character_set_client
collation_connection Database Collation
--empty CREATE DEFINER=`root`@`localhost` PROCEDURE
`empty`()\nbegin\nend latin1 latin1_swedish_ci latin1_swedish_ci
-+empty CREATE DEFINER=`root`@`localhost` PROCEDURE
`empty`()\nbegin\nend utf8 utf8_unicode_ci latin1_swedish_ci
- id data
- foo 42
- Procedure sql_mode Create Procedure character_set_client
collation_connection Database Collation
--foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert
into test.t1\n## These comments are part of the procedure body, and should be
kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n
-- empty line above\n values ("foo", 42) # comment 3, still part of the body
latin1 latin1_swedish_ci latin1_swedish_ci
-+foosp CREATE DEFINER=`root`@`localhost` PROCEDURE `foosp`()\ninsert
into test.t1\n## These comments are part of the procedure body, and should be
kept.\n# Comment 2a\n-- Comment 2b\n/* Comment 2c */\n -- empty line below\n\n
-- empty line above\n values ("foo", 42) # comment 3, still part of the body
utf8 utf8_unicode_ci latin1_swedish_ci
- Procedure sql_mode Create Procedure character_set_client
collation_connection Database Collation
--nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a
int)\nbegin\n -- declare some variables here\n declare b int;\n declare c
float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n --
famous last words ...\nend latin1 latin1_swedish_ci
latin1_swedish_ci
-+nicesp CREATE DEFINER=`root`@`localhost` PROCEDURE `nicesp`(a
int)\nbegin\n -- declare some variables here\n declare b int;\n declare c
float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n --
famous last words ...\nend utf8 utf8_unicode_ci latin1_swedish_ci
- Trigger sql_mode SQL Original Statement character_set_client
collation_connection Database Collation
--t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty
after delete on t1\nfor each row\nbegin\nend latin1 latin1_swedish_ci
latin1_swedish_ci
-+t1_empty CREATE DEFINER=`root`@`localhost` trigger t1_empty
after delete on t1\nfor each row\nbegin\nend utf8 utf8_unicode_ci
latin1_swedish_ci
- Trigger sql_mode SQL Original Statement character_set_client
collation_connection Database Collation
--t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert
on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment
1c\n*/\n -- declare some variables here\n declare b int;\n declare c
float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n --
famous last words ...\n set NEW.data := 12;\nend latin1
latin1_swedish_ci latin1_swedish_ci
-+t1_bi CREATE DEFINER=`root`@`localhost` trigger t1_bi before insert
on t1\nfor each row\nbegin\n# comment 1a\n-- comment 1b\n/*\n comment
1c\n*/\n -- declare some variables here\n declare b int;\n declare c
float;\n\n -- do more stuff here\n -- commented nicely and so on\n\n --
famous last words ...\n set NEW.data := 12;\nend utf8 utf8_unicode_ci
latin1_swedish_ci
- id data
- trig 12
- End of 5.0 tests
++++++ series ++++++
--- /var/tmp/diff_new_pack.t5R0Ox/_old 2013-01-21 17:41:23.000000000 +0100
+++ /var/tmp/diff_new_pack.t5R0Ox/_new 2013-01-21 17:41:23.000000000 +0100
@@ -1,5 +1,5 @@
mysql-community-server-5.1.31-shebang.patch
-mysql-community-server-5.5.6-utf8-test-results.patch
+mysql-community-server-5.5.29-utf8-test-results.patch
mariadb-5.5.28-hotcopy.patch
mysql-community-server-5.5.6-cnf.patch
mysql-community-server-5.5.8-group.patch
@@ -15,3 +15,5 @@
mysql-community-server-5.5.21-va_list-handling.patch
mysql-community-server-5.5.21-ppc64-libdir.patch
mysql-community-server-5.5.23-fail_on_missing_errmsg_sys.patch
+mysql-community-server-5.5.29-test-wrong-path.patch
+mysql-community-server-5.5.29-CVE-2012-5611.patch
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
