[Pkg-mysql-commits] r2079 - in mysql-5.5/branches/experimental/debian: . patches
Nicholas Bamber
periapt at alioth.debian.org
Thu May 3 16:53:25 UTC 2012
Author: periapt
Date: 2012-05-03 16:53:24 +0000 (Thu, 03 May 2012)
New Revision: 2079
Added:
mysql-5.5/branches/experimental/debian/patches/94_spelling.patch
Modified:
mysql-5.5/branches/experimental/debian/changelog
mysql-5.5/branches/experimental/debian/patches/series
Log:
* New upstream release: unspecified security issues CVE-2012-1697,
CVE-2012-1696
* Added patch to correct spelling mistakes: preceeding -> preceding
Modified: mysql-5.5/branches/experimental/debian/changelog
===================================================================
--- mysql-5.5/branches/experimental/debian/changelog 2012-05-02 00:10:19 UTC (rev 2078)
+++ mysql-5.5/branches/experimental/debian/changelog 2012-05-03 16:53:24 UTC (rev 2079)
@@ -1,9 +1,12 @@
-mysql-5.5 (5.5.20-2) UNRELEASED; urgency=low
+mysql-5.5 (5.5.23-1) UNRELEASED; urgency=low
* Added patch to test suite to accept socket paths less than 40
characters long (Closes: #540153)
* Disabled some more tests including some reported by Olaf van der Speck
* Removed ha_example.so from mysql-server-5.5 install (Closes: #666721)
+ * New upstream release: unspecified security issues CVE-2012-1697,
+ CVE-2012-1696
+ * Added patch to correct spelling mistakes: preceeding -> preceding
-- Nicholas Bamber <nicholas at periapt.co.uk> Sun, 29 Apr 2012 09:39:04 +0100
Added: mysql-5.5/branches/experimental/debian/patches/94_spelling.patch
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/94_spelling.patch (rev 0)
+++ mysql-5.5/branches/experimental/debian/patches/94_spelling.patch 2012-05-03 16:53:24 UTC (rev 2079)
@@ -0,0 +1,163 @@
+Author <nicholas at periapt.co.uk>
+Subject: spelling errors
+ Preceeding -> preceding
+Last-Update: 2012-05-02
+Forwarded: no
+--- a/libmysql/errmsg.c
++++ b/libmysql/errmsg.c
+@@ -81,7 +81,7 @@
+ "Attempt to read a row while there is no result set associated with the statement",
+ "This feature is not implemented yet",
+ "Lost connection to MySQL server at '%s', system error: %d",
+- "Statement closed indirectly because of a preceeding %s() call",
++ "Statement closed indirectly because of a preceding %s() call",
+ "The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again",
+ "This handle is already connected. Use a separate handle for each connection.",
+ "Authentication plugin '%s' cannot be loaded: %s",
+--- a/Docs/mysql.info
++++ b/Docs/mysql.info
+@@ -233132,7 +233132,7 @@
+
+ * Error: `2056' (`CR_STMT_CLOSED')
+
+- Message: Statement closed indirectly because of a preceeding %s()
++ Message: Statement closed indirectly because of a preceding %s()
+ call
+
+ * Error: `2057' (`CR_NEW_STMT_METADATA')
+--- a/mysql-test/extra/rpl_tests/rpl_ddl.test
++++ b/mysql-test/extra/rpl_tests/rpl_ddl.test
+@@ -98,8 +98,8 @@
+ # --> less switching of AUTOCOMMIT mode on master side.
+ #
+ # 4. Never use a test object, which was direct or indirect affected by a
+-# preceeding test sequence again.
+-# If one preceeding test sequence hits a (sometimes not visible,
++# preceding test sequence again.
++# If one preceding test sequence hits a (sometimes not visible,
+ # because the sql error code of the statement might be 0) bug
+ # and these rules are ignored, a following test sequence might earn ugly
+ # effects like failing 'sync_slave_with_master', crashes of the slave or
+--- a/mysql-test/extra/rpl_tests/rpl_row_basic.test
++++ b/mysql-test/extra/rpl_tests/rpl_row_basic.test
+@@ -186,7 +186,7 @@
+ SELECT * FROM t7 ORDER BY C1;
+
+ # since bug#31552/31609 idempotency is not default any longer. In order
+-# the preceeding test INSERT INTO t7 to pass the mode is switched
++# the preceding test INSERT INTO t7 to pass the mode is switched
+ # temprorarily
+ set @@global.slave_exec_mode= 'IDEMPOTENT';
+
+@@ -225,7 +225,7 @@
+ SELECT * FROM t8 ORDER BY a;
+
+ # since bug#31552/31609 idempotency is not default any longer. In order
+-# the preceeding test INSERT INTO t8 to pass the mode is switched
++# the preceding test INSERT INTO t8 to pass the mode is switched
+ # temprorarily
+ set @@global.slave_exec_mode= 'IDEMPOTENT';
+
+--- a/mysql-test/include/wait_until_count_sessions.inc
++++ b/mysql-test/include/wait_until_count_sessions.inc
+@@ -10,7 +10,7 @@
+ # 1. We wait for $current_sessions <= $count_sessions because in the use case
+ # with count_sessions.inc before and wait_until_count_sessions.inc after
+ # the core of the test it could happen that the disconnects of sessions
+-# belonging to the preceeding test are not finished.
++# belonging to the preceding test are not finished.
+ # sessions at test begin($count_sessions) = m + n
+ # sessions of the previous test which will be soon disconnected = n (n >= 0)
+ # sessions at test end ($current sessions, assuming the test disconnects
+--- a/mysql-test/suite/funcs_1/views/func_view.inc
++++ b/mysql-test/suite/funcs_1/views/func_view.inc
+@@ -282,7 +282,7 @@
+ # other interesting value
+ # numbers -> 0
+ # strings, blobs, binaries -> not full length of used data type, "exotic"
+-# characters and preceeding and trailing spaces
++# characters and preceding and trailing spaces
+ # FIXME enum, set ??
+ INSERT INTO t1_values SET
+ my_char_30 = ' ---äÖüß@µ*$-- ',
+--- a/mysql-test/suite/funcs_1/views/views_master.inc
++++ b/mysql-test/suite/funcs_1/views/views_master.inc
+@@ -545,7 +545,7 @@
+ # view names are accepted, at creation time, alteration time,
+ # and drop time.
+ ###############################################################################
+-# Note(mleich): non-qualified view name means a view name without preceeding
++# Note(mleich): non-qualified view name means a view name without preceding
+ # database name
+ --disable_warnings
+ DROP VIEW IF EXISTS v1 ;
+--- a/mysql-test/suite/rpl/t/rpl_ddl.test
++++ b/mysql-test/suite/rpl/t/rpl_ddl.test
+@@ -13,10 +13,10 @@
+ # sequences start.
+ #
+ # 2. Never use a test object, which was direct or indirect affected by a
+-# preceeding test sequence again.
++# preceding test sequence again.
+ # Except table d1.t1 where ONLY DML is allowed.
+ #
+-# If one preceeding test sequence hits a (sometimes not good visible,
++# If one preceding test sequence hits a (sometimes not good visible,
+ # because the sql error code of the statement might be 0) bug
+ # and these rules are ignored, a following test sequence might earn ugly
+ # effects like failing 'sync_slave_with_master', crashes of the slave or
+--- a/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
++++ b/mysql-test/suite/rpl/t/rpl_row_basic_11bugs.test
+@@ -239,7 +239,7 @@
+ UPDATE t1 SET a = 5, b = 'slave' WHERE a = 1;
+ SELECT * FROM t1 ORDER BY a;
+ # since bug#31552/31609 idempotency is not default any longer. In
+-# order for the preceeding test UPDATE t1 to pass, the mode is switched
++# order for the preceding test UPDATE t1 to pass, the mode is switched
+ # temprorarily
+ set @@global.slave_exec_mode= 'IDEMPOTENT';
+ --echo **** On Master ****
+--- a/sql/log_event.cc
++++ b/sql/log_event.cc
+@@ -3236,7 +3236,7 @@
+ if ((error= rows_event_stmt_cleanup(const_cast<Relay_log_info*>(rli), thd)))
+ {
+ const_cast<Relay_log_info*>(rli)->report(ERROR_LEVEL, error,
+- "Error in cleaning up after an event preceeding the commit; "
++ "Error in cleaning up after an event preceding the commit; "
+ "the group log file/position: %s %s",
+ const_cast<Relay_log_info*>(rli)->group_master_log_name,
+ llstr(const_cast<Relay_log_info*>(rli)->group_master_log_pos,
+--- a/storage/myisam/mi_rnext.c
++++ b/storage/myisam/mi_rnext.c
+@@ -64,7 +64,7 @@
+ Normally SQL layer would never request "search next" if
+ "search first" failed. But HANDLER may do anything.
+
+- As mi_rnext() without preceeding mi_rkey()/mi_rfirst()
++ As mi_rnext() without preceding mi_rkey()/mi_rfirst()
+ equals to mi_rfirst(), we must restore original state
+ as if failing mi_rfirst() was not called.
+ */
+--- a/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
++++ b/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
+@@ -41,7 +41,7 @@
+ * Test returning descriptor information
+ *
+ * Tests:
+- * -# Call SQLColAttribute, without preceeding SQLPrepare
++ * -# Call SQLColAttribute, without preceding SQLPrepare
+ * -# ???
+ *
+ * @return Zero, if test succeeded
+--- a/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
++++ b/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
+@@ -41,7 +41,7 @@
+ * Test returning descriptor information
+ *
+ * Test:
+- * -# Call SQLColAttribute without preceeding SQLExecute
++ * -# Call SQLColAttribute without preceding SQLExecute
+ * -# Let TYPE is 'ITEM' in Table 20, FieldIdentifer is zero
+ * -# Let TYPE is 'ITEM' in Table 20, ColumnNumber is less than one
+ * -# FieldIdentifer is not one of the code valuess in Table 20
Modified: mysql-5.5/branches/experimental/debian/patches/series
===================================================================
--- mysql-5.5/branches/experimental/debian/patches/series 2012-05-02 00:10:19 UTC (rev 2078)
+++ mysql-5.5/branches/experimental/debian/patches/series 2012-05-03 16:53:24 UTC (rev 2079)
@@ -7,3 +7,4 @@
72_fix_standalone_tests.patch
73_mysqlcheck_tests.patch
93_kfreebsd_tests.patch
+94_spelling.patch
More information about the Pkg-mysql-commits
mailing list