From 37ef281d4c383e9da360b90ea7d990c7f4c10a3d Mon Sep 17 00:00:00 2001 From: periapt Date: Sun, 13 May 2012 04:15:51 +0000 Subject: Removed the numerical prefix from the patch files git-svn-id: svn://svn.debian.org/svn/pkg-mysql/mysql-5.5/branches/unstable@2103 bb5a2ed9-75f0-0310-a2b8-e46d7b0922c1 --- debian/changelog | 1 + debian/patches/1_hurd.patch | 41 ------ debian/patches/2_main_openssl_1.patch | 22 --- .../38_scripts__mysqld_safe.sh__signals.patch | 44 ------ debian/patches/62_disable_tests.patch | 16 -- debian/patches/70_mysql_va_list.patch | 53 ------- debian/patches/71_disable_rpl_tests.patch | 12 -- debian/patches/72_fix_standalone_tests.patch | 19 --- debian/patches/73_mysqlcheck_tests.patch | 42 ------ debian/patches/93_kfreebsd_tests.patch | 18 --- debian/patches/94_spelling.patch | 163 --------------------- debian/patches/disable_rpl_tests.patch | 12 ++ debian/patches/disable_tests.patch | 16 ++ debian/patches/fix_standalone_tests.patch | 19 +++ debian/patches/hurd.patch | 41 ++++++ debian/patches/kfreebsd_tests.patch | 18 +++ debian/patches/main_openssl_1.patch | 22 +++ debian/patches/mysql_va_list.patch | 53 +++++++ debian/patches/mysqlcheck_tests.patch | 42 ++++++ .../patches/scripts__mysqld_safe.sh__signals.patch | 44 ++++++ debian/patches/series | 20 +-- debian/patches/spelling.patch | 163 +++++++++++++++++++++ 22 files changed, 441 insertions(+), 440 deletions(-) delete mode 100644 debian/patches/1_hurd.patch delete mode 100644 debian/patches/2_main_openssl_1.patch delete mode 100644 debian/patches/38_scripts__mysqld_safe.sh__signals.patch delete mode 100644 debian/patches/62_disable_tests.patch delete mode 100644 debian/patches/70_mysql_va_list.patch delete mode 100644 debian/patches/71_disable_rpl_tests.patch delete mode 100644 debian/patches/72_fix_standalone_tests.patch delete mode 100644 debian/patches/73_mysqlcheck_tests.patch delete mode 100644 debian/patches/93_kfreebsd_tests.patch delete mode 100644 debian/patches/94_spelling.patch create mode 100644 debian/patches/disable_rpl_tests.patch create mode 100644 debian/patches/disable_tests.patch create mode 100644 debian/patches/fix_standalone_tests.patch create mode 100644 debian/patches/hurd.patch create mode 100644 debian/patches/kfreebsd_tests.patch create mode 100644 debian/patches/main_openssl_1.patch create mode 100644 debian/patches/mysql_va_list.patch create mode 100644 debian/patches/mysqlcheck_tests.patch create mode 100644 debian/patches/scripts__mysqld_safe.sh__signals.patch create mode 100644 debian/patches/spelling.patch diff --git a/debian/changelog b/debian/changelog index 2ac9f5c..204862a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ mysql-5.5 (5.5.23-3) UNRELEASED; urgency=low * Converted mysql-source-5.5 to arch:all * Removed source cruft: debian/additions/mysql_config.1 * Restored zlib1g-dev build dependency pending further investigation + * Removed the numerical prefix from the patch files -- Nicholas Bamber Tue, 08 May 2012 09:04:25 +0100 diff --git a/debian/patches/1_hurd.patch b/debian/patches/1_hurd.patch deleted file mode 100644 index dbd44e7..0000000 --- a/debian/patches/1_hurd.patch +++ /dev/null @@ -1,41 +0,0 @@ -Author: Pino Toscano -Subject: cmake options for GNU/Hurd -Bug: http://bugs.mysql.com/bug.php?id=64685 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651002 -Last-Update: 2012-03-18 -Reviewed-by: Nicholas Bamber ---- /dev/null -+++ b/cmake/os/GNU.cmake -@@ -0,0 +1,20 @@ -+# This file includes GNU/Hurd specific options and quirks, related to system checks -+ -+INCLUDE(CheckSymbolExists) -+ -+SET(_GNU_SOURCE 1) -+ -+# Fix CMake (< 2.8) flags. -rdynamic exports too many symbols. -+FOREACH(LANG C CXX) -+ STRING(REPLACE "-rdynamic" "" -+ CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS -+ "${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}" -+ ) -+ENDFOREACH() -+ -+# Ensure we have clean build for shared libraries -+# without unresolved symbols -+SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined") -+ -+# 64 bit file offset support flag -+SET(_FILE_OFFSET_BITS 64) ---- a/mysql-test/lib/My/Platform.pm -+++ b/mysql-test/lib/My/Platform.pm -@@ -110,6 +110,9 @@ - # This may not be true, but we can't test for it on AIX due to Perl bug - # See Bug #45771 - return 0 if ($^O eq 'aix'); -+ # Similarly the path length is hidden. -+ # See Debian bug #651002 -+ return 0 if ($^O eq 'gnu'); - - require IO::Socket::UNIX; - diff --git a/debian/patches/2_main_openssl_1.patch b/debian/patches/2_main_openssl_1.patch deleted file mode 100644 index 1be90b1..0000000 --- a/debian/patches/2_main_openssl_1.patch +++ /dev/null @@ -1,22 +0,0 @@ -Author: Nicholas Bamber -Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660799 -Forwarded: no -Last-Update: 2012-03-02 -Subject: This test fails in the presence of libssl-dev - and SSL functionality seems to fail without it. - ---- a/mysql-test/r/openssl_1.result -+++ b/mysql-test/r/openssl_1.result -@@ -44,9 +44,9 @@ - drop user ssl_user1@localhost, ssl_user2@localhost, - ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost; - drop table t1; --mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation --mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation --mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation -+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1) -+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1) -+mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1) - SSL error: Unable to get private key from '' - mysqltest: Could not open connection 'default': 2026 SSL connection error: Unable to get private key - SSL error: Unable to get certificate from '' diff --git a/debian/patches/38_scripts__mysqld_safe.sh__signals.patch b/debian/patches/38_scripts__mysqld_safe.sh__signals.patch deleted file mode 100644 index be06efb..0000000 --- a/debian/patches/38_scripts__mysqld_safe.sh__signals.patch +++ /dev/null @@ -1,44 +0,0 @@ -Author: Christian Hammers -Subject: Executes /etc/init.d/mysql on signals - Note if you check the bug report on mysql.com the patch is accepted - as interesting but they were waiting on Christian Hammers to sign an SCA. - Meanwhile this bug report fell off in the transition from 5.0 to 5.1. -Bug: http://bugs.mysql.com/bug.php?id=31361 -Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527623 -Last-Update: 2012-03-07 -Reviewed-by: Nicholas Bamber - ---- a/scripts/mysqld_safe.sh -+++ b/scripts/mysqld_safe.sh -@@ -29,8 +29,6 @@ - syslog_tag_mysqld=mysqld - syslog_tag_mysqld_safe=mysqld_safe - --trap '' 1 2 3 15 # we shouldn't let anyone kill us -- - umask 007 - - defaults= -@@ -132,7 +130,7 @@ - # sed buffers output (only GNU sed supports a -u (unbuffered) option) - # which means that messages may not get sent to syslog until the - # mysqld process quits. -- cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error" -+ cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error & wait" - ;; - *) - echo "Internal program error (non-fatal):" \ -@@ -711,6 +709,13 @@ - fi - - # -+# From now on, we catch signals to do a proper shutdown of mysqld -+# when signalled to do so. -+# -+trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf refresh & wait' 1 # HUP -+trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf shutdown' 2 3 15 # INT QUIT and TERM -+ -+# - # Uncomment the following lines if you want all tables to be automatically - # checked and repaired during startup. You should add sensible key_buffer - # and sort_buffer values to my.cnf to improve check performance or require diff --git a/debian/patches/62_disable_tests.patch b/debian/patches/62_disable_tests.patch deleted file mode 100644 index 55dc2f4..0000000 --- a/debian/patches/62_disable_tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Clint Byrum -Subject: Convenient place to disable tests that are currently failing -Forwarded: not-needed -Last-Update: 2012-03-07 -Reviewed-by: Nicholas Bamber ---- a/mysql-test/t/disabled.def -+++ b/mysql-test/t/disabled.def -@@ -15,3 +15,8 @@ - archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc - log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists - mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836 -+partition_rename_longfilename : Fails when building with sbuild and schroots -+file_contents : Fails without bzr revision id -+mysqlslap : n/a 2012-04-29 Failed once on kfreebsd -+mysqlhotcopy_isam : n/a 2012-04-29 Olaf van der Spek reported this failure -+mysqlhotcopy_archive : n/a 2012-04-29 Olaf van der Spek reported this failure diff --git a/debian/patches/70_mysql_va_list.patch b/debian/patches/70_mysql_va_list.patch deleted file mode 100644 index e4a8b04..0000000 --- a/debian/patches/70_mysql_va_list.patch +++ /dev/null @@ -1,53 +0,0 @@ -Bug: http://bugs.mysql.com/bug.php?id=62769 -Bug-Ubuntu: http://pad.lv/700982 -Description: make sure va_list usage is portable to fix FTBFS on ARM - -diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/client_plugin.c ---- mysql-5.5.16.orig/sql-common/client_plugin.c 2011-09-09 11:56:39.000000000 -0400 -+++ mysql-5.5.16/sql-common/client_plugin.c 2011-10-16 23:00:00.708799138 -0400 -@@ -228,11 +228,13 @@ - { - MYSQL mysql; - struct st_mysql_client_plugin **builtin; -+ va_list unused; - - if (initialized) - return 0; - - bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */ -+ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ - - pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW); - init_alloc_root(&mem_root, 128, 128); -@@ -244,7 +246,7 @@ - pthread_mutex_lock(&LOCK_load_client_plugin); - - for (builtin= mysql_client_builtins; *builtin; builtin++) -- add_plugin(&mysql, *builtin, 0, 0, 0); -+ add_plugin(&mysql, *builtin, 0, 0, unused); - - pthread_mutex_unlock(&LOCK_load_client_plugin); - -@@ -288,9 +290,13 @@ - mysql_client_register_plugin(MYSQL *mysql, - struct st_mysql_client_plugin *plugin) - { -+ va_list unused; -+ - if (is_not_initialized(mysql, plugin->name)) - return NULL; - -+ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ -+ - pthread_mutex_lock(&LOCK_load_client_plugin); - - /* make sure the plugin wasn't loaded meanwhile */ -@@ -302,7 +308,7 @@ - plugin= NULL; - } - else -- plugin= add_plugin(mysql, plugin, 0, 0, 0); -+ plugin= add_plugin(mysql, plugin, 0, 0, unused); - - pthread_mutex_unlock(&LOCK_load_client_plugin); - return plugin; diff --git a/debian/patches/71_disable_rpl_tests.patch b/debian/patches/71_disable_rpl_tests.patch deleted file mode 100644 index c8fe54e..0000000 --- a/debian/patches/71_disable_rpl_tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -From: Clint Byrum -Bug-Ubuntu: http://pad.lv/894146 -Forwarded: no, not needed -Description: disables test to allow build to pass while this is investigated. - ---- a/mysql-test/suite/rpl/t/disabled.def -+++ b/mysql-test/suite/rpl/t/disabled.def -@@ -15,3 +15,4 @@ - rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock - rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out - rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out -+rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146 diff --git a/debian/patches/72_fix_standalone_tests.patch b/debian/patches/72_fix_standalone_tests.patch deleted file mode 100644 index 8635025..0000000 --- a/debian/patches/72_fix_standalone_tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Clint Byrum -Description: makes mtr look in the standard location from the - mysql-testsuite-5.5 package. -Forwarded: not-needed - -Index: mysql-5.5/mysql-test/lib/mtr_cases.pm -=================================================================== ---- mysql-5.5.orig/mysql-test/lib/mtr_cases.pm 2011-11-14 15:35:04.238715000 -0800 -+++ mysql-5.5/mysql-test/lib/mtr_cases.pm 2011-11-25 14:41:00.433887578 -0800 -@@ -286,7 +286,8 @@ - else - { - $suitedir= my_find_dir($::basedir, -- ["share/mysql-test/suite", -+ ["lib/mysql-testsuite/suite", -+ "share/mysql-test/suite", - "mysql-test/suite", - "mysql-test", - # Look in storage engine specific suite dirs diff --git a/debian/patches/73_mysqlcheck_tests.patch b/debian/patches/73_mysqlcheck_tests.patch deleted file mode 100644 index 1121ed7..0000000 --- a/debian/patches/73_mysqlcheck_tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -Author: Nicholas Bamber -Bug: http://bugs.mysql.com/bug.php?id=64773 -Date: 2012-03-27 -Subject: Large number of bugs that suddenly started to fail. - Have not been able to isolate the exact trigger. - However several involve mysqlcheck failing to execute - and that at least might be easy to investigate further. - mysql-test-run of course starts the database, and forks off mysql_upgrade. - The latter forks off mysqlcheck. - Some of the other tests might be easily patchable by updating - the expected test results - run ./mysql-test-run --record - and copy the results file into the source mysql-test directory. ---- a/mysql-test/t/disabled.def -+++ b/mysql-test/t/disabled.def -@@ -20,3 +20,12 @@ - mysqlslap : n/a 2012-04-29 Failed once on kfreebsd - mysqlhotcopy_isam : n/a 2012-04-29 Olaf van der Spek reported this failure - mysqlhotcopy_archive : n/a 2012-04-29 Olaf van der Spek reported this failure -+plugin_auth : Bug#64773 2012-03-27 Debian local -+ssl_8k_key : Bug#64773 2012-03-27 Debian local -+log_tables_upgrade : Bug#64773 2012-03-27 Debian local -+mysql_upgrade : Bug#64773 2012-03-27 Debian local -+mysql_upgrade_ssl : Bug#64773 2012-03-27 Debian local -+mysqladmin : Bug#64773 2012-03-27 Debian local -+ssl_compress : Bug#64773 2012-03-27 Debian local -+ssl : Bug#64773 2012-03-27 Debian local -+openssl_1 : Bug#64773 2012-03-27 Debian local ---- a/mysql-test/suite/perfschema/t/disabled.def -+++ b/mysql-test/suite/perfschema/t/disabled.def -@@ -9,4 +9,4 @@ - # Do not use any TAB characters for whitespace. - # - ############################################################################## -- -+pfs_upgrade: BUG#64773 ---- a/mysql-test/suite/rpl/t/disabled.def -+++ b/mysql-test/suite/rpl/t/disabled.def -@@ -16,3 +16,4 @@ - rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out - rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out - rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146 -+rpl_mysql_upgrade: Fails on Debian #64773 diff --git a/debian/patches/93_kfreebsd_tests.patch b/debian/patches/93_kfreebsd_tests.patch deleted file mode 100644 index 3aaa8ce..0000000 --- a/debian/patches/93_kfreebsd_tests.patch +++ /dev/null @@ -1,18 +0,0 @@ -Author: Nicholas Bamber -Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=540153 -Subject: tests not getting started on kFreeBSD - As per #670722 I found that the test socket created to test - file name truncation was barfing even for the shortened form. -Forwarded: no -Last-Update: 2012-04-28 ---- a/mysql-test/lib/My/Platform.pm -+++ b/mysql-test/lib/My/Platform.pm -@@ -113,6 +113,8 @@ - # Similarly the path length is hidden. - # See Debian bug #651002 - return 0 if ($^O eq 'gnu'); -+ # See Debian bug #670722 - failing on kFreeBSD even after setting short path -+ return 0 if length $path < 40; - - require IO::Socket::UNIX; - diff --git a/debian/patches/94_spelling.patch b/debian/patches/94_spelling.patch deleted file mode 100644 index eaf9b3d..0000000 --- a/debian/patches/94_spelling.patch +++ /dev/null @@ -1,163 +0,0 @@ -Author -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(rli), thd))) - { - const_cast(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(rli)->group_master_log_name, - llstr(const_cast(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 diff --git a/debian/patches/disable_rpl_tests.patch b/debian/patches/disable_rpl_tests.patch new file mode 100644 index 0000000..c8fe54e --- /dev/null +++ b/debian/patches/disable_rpl_tests.patch @@ -0,0 +1,12 @@ +From: Clint Byrum +Bug-Ubuntu: http://pad.lv/894146 +Forwarded: no, not needed +Description: disables test to allow build to pass while this is investigated. + +--- a/mysql-test/suite/rpl/t/disabled.def ++++ b/mysql-test/suite/rpl/t/disabled.def +@@ -15,3 +15,4 @@ + rpl_get_master_version_and_clock : Bug#11766137 Jan 05 2011 joro Valgrind warnings rpl_get_master_version_and_clock + rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out + rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out ++rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146 diff --git a/debian/patches/disable_tests.patch b/debian/patches/disable_tests.patch new file mode 100644 index 0000000..55dc2f4 --- /dev/null +++ b/debian/patches/disable_tests.patch @@ -0,0 +1,16 @@ +Author: Clint Byrum +Subject: Convenient place to disable tests that are currently failing +Forwarded: not-needed +Last-Update: 2012-03-07 +Reviewed-by: Nicholas Bamber +--- a/mysql-test/t/disabled.def ++++ b/mysql-test/t/disabled.def +@@ -15,3 +15,8 @@ + archive-big : Bug#11817185 2011-03-10 Anitha Disabled since this leads to timeout on Solaris Sparc + log_tables-big : Bug#11756699 2010-11-15 mattiasj report already exists + mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836 ++partition_rename_longfilename : Fails when building with sbuild and schroots ++file_contents : Fails without bzr revision id ++mysqlslap : n/a 2012-04-29 Failed once on kfreebsd ++mysqlhotcopy_isam : n/a 2012-04-29 Olaf van der Spek reported this failure ++mysqlhotcopy_archive : n/a 2012-04-29 Olaf van der Spek reported this failure diff --git a/debian/patches/fix_standalone_tests.patch b/debian/patches/fix_standalone_tests.patch new file mode 100644 index 0000000..8635025 --- /dev/null +++ b/debian/patches/fix_standalone_tests.patch @@ -0,0 +1,19 @@ +From: Clint Byrum +Description: makes mtr look in the standard location from the + mysql-testsuite-5.5 package. +Forwarded: not-needed + +Index: mysql-5.5/mysql-test/lib/mtr_cases.pm +=================================================================== +--- mysql-5.5.orig/mysql-test/lib/mtr_cases.pm 2011-11-14 15:35:04.238715000 -0800 ++++ mysql-5.5/mysql-test/lib/mtr_cases.pm 2011-11-25 14:41:00.433887578 -0800 +@@ -286,7 +286,8 @@ + else + { + $suitedir= my_find_dir($::basedir, +- ["share/mysql-test/suite", ++ ["lib/mysql-testsuite/suite", ++ "share/mysql-test/suite", + "mysql-test/suite", + "mysql-test", + # Look in storage engine specific suite dirs diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch new file mode 100644 index 0000000..dbd44e7 --- /dev/null +++ b/debian/patches/hurd.patch @@ -0,0 +1,41 @@ +Author: Pino Toscano +Subject: cmake options for GNU/Hurd +Bug: http://bugs.mysql.com/bug.php?id=64685 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651002 +Last-Update: 2012-03-18 +Reviewed-by: Nicholas Bamber +--- /dev/null ++++ b/cmake/os/GNU.cmake +@@ -0,0 +1,20 @@ ++# This file includes GNU/Hurd specific options and quirks, related to system checks ++ ++INCLUDE(CheckSymbolExists) ++ ++SET(_GNU_SOURCE 1) ++ ++# Fix CMake (< 2.8) flags. -rdynamic exports too many symbols. ++FOREACH(LANG C CXX) ++ STRING(REPLACE "-rdynamic" "" ++ CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS ++ "${CMAKE_SHARED_LIBRARY_LINK_${LANG}_FLAGS}" ++ ) ++ENDFOREACH() ++ ++# Ensure we have clean build for shared libraries ++# without unresolved symbols ++SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined") ++ ++# 64 bit file offset support flag ++SET(_FILE_OFFSET_BITS 64) +--- a/mysql-test/lib/My/Platform.pm ++++ b/mysql-test/lib/My/Platform.pm +@@ -110,6 +110,9 @@ + # This may not be true, but we can't test for it on AIX due to Perl bug + # See Bug #45771 + return 0 if ($^O eq 'aix'); ++ # Similarly the path length is hidden. ++ # See Debian bug #651002 ++ return 0 if ($^O eq 'gnu'); + + require IO::Socket::UNIX; + diff --git a/debian/patches/kfreebsd_tests.patch b/debian/patches/kfreebsd_tests.patch new file mode 100644 index 0000000..3aaa8ce --- /dev/null +++ b/debian/patches/kfreebsd_tests.patch @@ -0,0 +1,18 @@ +Author: Nicholas Bamber +Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=540153 +Subject: tests not getting started on kFreeBSD + As per #670722 I found that the test socket created to test + file name truncation was barfing even for the shortened form. +Forwarded: no +Last-Update: 2012-04-28 +--- a/mysql-test/lib/My/Platform.pm ++++ b/mysql-test/lib/My/Platform.pm +@@ -113,6 +113,8 @@ + # Similarly the path length is hidden. + # See Debian bug #651002 + return 0 if ($^O eq 'gnu'); ++ # See Debian bug #670722 - failing on kFreeBSD even after setting short path ++ return 0 if length $path < 40; + + require IO::Socket::UNIX; + diff --git a/debian/patches/main_openssl_1.patch b/debian/patches/main_openssl_1.patch new file mode 100644 index 0000000..1be90b1 --- /dev/null +++ b/debian/patches/main_openssl_1.patch @@ -0,0 +1,22 @@ +Author: Nicholas Bamber +Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660799 +Forwarded: no +Last-Update: 2012-03-02 +Subject: This test fails in the presence of libssl-dev + and SSL functionality seems to fail without it. + +--- a/mysql-test/r/openssl_1.result ++++ b/mysql-test/r/openssl_1.result +@@ -44,9 +44,9 @@ + drop user ssl_user1@localhost, ssl_user2@localhost, + ssl_user3@localhost, ssl_user4@localhost, ssl_user5@localhost; + drop table t1; +-mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation +-mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation +-mysqltest: Could not open connection 'default': 2026 SSL connection error: ASN: bad other signature confirmation ++mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1) ++mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1) ++mysqltest: Could not open connection 'default': 2026 SSL connection error: error:00000001:lib(0):func(0):reason(1) + SSL error: Unable to get private key from '' + mysqltest: Could not open connection 'default': 2026 SSL connection error: Unable to get private key + SSL error: Unable to get certificate from '' diff --git a/debian/patches/mysql_va_list.patch b/debian/patches/mysql_va_list.patch new file mode 100644 index 0000000..e4a8b04 --- /dev/null +++ b/debian/patches/mysql_va_list.patch @@ -0,0 +1,53 @@ +Bug: http://bugs.mysql.com/bug.php?id=62769 +Bug-Ubuntu: http://pad.lv/700982 +Description: make sure va_list usage is portable to fix FTBFS on ARM + +diff -Naur mysql-5.5.16.orig/sql-common/client_plugin.c mysql-5.5.16/sql-common/client_plugin.c +--- mysql-5.5.16.orig/sql-common/client_plugin.c 2011-09-09 11:56:39.000000000 -0400 ++++ mysql-5.5.16/sql-common/client_plugin.c 2011-10-16 23:00:00.708799138 -0400 +@@ -228,11 +228,13 @@ + { + MYSQL mysql; + struct st_mysql_client_plugin **builtin; ++ va_list unused; + + if (initialized) + return 0; + + bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */ ++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ + + pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW); + init_alloc_root(&mem_root, 128, 128); +@@ -244,7 +246,7 @@ + pthread_mutex_lock(&LOCK_load_client_plugin); + + for (builtin= mysql_client_builtins; *builtin; builtin++) +- add_plugin(&mysql, *builtin, 0, 0, 0); ++ add_plugin(&mysql, *builtin, 0, 0, unused); + + pthread_mutex_unlock(&LOCK_load_client_plugin); + +@@ -288,9 +290,13 @@ + mysql_client_register_plugin(MYSQL *mysql, + struct st_mysql_client_plugin *plugin) + { ++ va_list unused; ++ + if (is_not_initialized(mysql, plugin->name)) + return NULL; + ++ bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */ ++ + pthread_mutex_lock(&LOCK_load_client_plugin); + + /* make sure the plugin wasn't loaded meanwhile */ +@@ -302,7 +308,7 @@ + plugin= NULL; + } + else +- plugin= add_plugin(mysql, plugin, 0, 0, 0); ++ plugin= add_plugin(mysql, plugin, 0, 0, unused); + + pthread_mutex_unlock(&LOCK_load_client_plugin); + return plugin; diff --git a/debian/patches/mysqlcheck_tests.patch b/debian/patches/mysqlcheck_tests.patch new file mode 100644 index 0000000..1121ed7 --- /dev/null +++ b/debian/patches/mysqlcheck_tests.patch @@ -0,0 +1,42 @@ +Author: Nicholas Bamber +Bug: http://bugs.mysql.com/bug.php?id=64773 +Date: 2012-03-27 +Subject: Large number of bugs that suddenly started to fail. + Have not been able to isolate the exact trigger. + However several involve mysqlcheck failing to execute + and that at least might be easy to investigate further. + mysql-test-run of course starts the database, and forks off mysql_upgrade. + The latter forks off mysqlcheck. + Some of the other tests might be easily patchable by updating + the expected test results - run ./mysql-test-run --record + and copy the results file into the source mysql-test directory. +--- a/mysql-test/t/disabled.def ++++ b/mysql-test/t/disabled.def +@@ -20,3 +20,12 @@ + mysqlslap : n/a 2012-04-29 Failed once on kfreebsd + mysqlhotcopy_isam : n/a 2012-04-29 Olaf van der Spek reported this failure + mysqlhotcopy_archive : n/a 2012-04-29 Olaf van der Spek reported this failure ++plugin_auth : Bug#64773 2012-03-27 Debian local ++ssl_8k_key : Bug#64773 2012-03-27 Debian local ++log_tables_upgrade : Bug#64773 2012-03-27 Debian local ++mysql_upgrade : Bug#64773 2012-03-27 Debian local ++mysql_upgrade_ssl : Bug#64773 2012-03-27 Debian local ++mysqladmin : Bug#64773 2012-03-27 Debian local ++ssl_compress : Bug#64773 2012-03-27 Debian local ++ssl : Bug#64773 2012-03-27 Debian local ++openssl_1 : Bug#64773 2012-03-27 Debian local +--- a/mysql-test/suite/perfschema/t/disabled.def ++++ b/mysql-test/suite/perfschema/t/disabled.def +@@ -9,4 +9,4 @@ + # Do not use any TAB characters for whitespace. + # + ############################################################################## +- ++pfs_upgrade: BUG#64773 +--- a/mysql-test/suite/rpl/t/disabled.def ++++ b/mysql-test/suite/rpl/t/disabled.def +@@ -16,3 +16,4 @@ + rpl_row_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out + rpl_stm_until : BUG#59543 Jan 26 2011 alfranio Replication test from eits suite rpl_row_until times out + rpl_heartbeat_basic : Fails intermittently on AMD64 buildds http://pad.lv/894146 ++rpl_mysql_upgrade: Fails on Debian #64773 diff --git a/debian/patches/scripts__mysqld_safe.sh__signals.patch b/debian/patches/scripts__mysqld_safe.sh__signals.patch new file mode 100644 index 0000000..be06efb --- /dev/null +++ b/debian/patches/scripts__mysqld_safe.sh__signals.patch @@ -0,0 +1,44 @@ +Author: Christian Hammers +Subject: Executes /etc/init.d/mysql on signals + Note if you check the bug report on mysql.com the patch is accepted + as interesting but they were waiting on Christian Hammers to sign an SCA. + Meanwhile this bug report fell off in the transition from 5.0 to 5.1. +Bug: http://bugs.mysql.com/bug.php?id=31361 +Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=527623 +Last-Update: 2012-03-07 +Reviewed-by: Nicholas Bamber + +--- a/scripts/mysqld_safe.sh ++++ b/scripts/mysqld_safe.sh +@@ -29,8 +29,6 @@ + syslog_tag_mysqld=mysqld + syslog_tag_mysqld_safe=mysqld_safe + +-trap '' 1 2 3 15 # we shouldn't let anyone kill us +- + umask 007 + + defaults= +@@ -132,7 +130,7 @@ + # sed buffers output (only GNU sed supports a -u (unbuffered) option) + # which means that messages may not get sent to syslog until the + # mysqld process quits. +- cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error" ++ cmd="$cmd 2>&1 | logger -t '$syslog_tag_mysqld' -p daemon.error & wait" + ;; + *) + echo "Internal program error (non-fatal):" \ +@@ -711,6 +709,13 @@ + fi + + # ++# From now on, we catch signals to do a proper shutdown of mysqld ++# when signalled to do so. ++# ++trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf refresh & wait' 1 # HUP ++trap '/usr/bin/mysqladmin --defaults-extra-file=/etc/mysql/debian.cnf shutdown' 2 3 15 # INT QUIT and TERM ++ ++# + # Uncomment the following lines if you want all tables to be automatically + # checked and repaired during startup. You should add sensible key_buffer + # and sort_buffer values to my.cnf to improve check performance or require diff --git a/debian/patches/series b/debian/patches/series index 9bce48e..e07f7e2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,10 +1,10 @@ -1_hurd.patch -2_main_openssl_1.patch -38_scripts__mysqld_safe.sh__signals.patch -62_disable_tests.patch -70_mysql_va_list.patch -71_disable_rpl_tests.patch -72_fix_standalone_tests.patch -73_mysqlcheck_tests.patch -93_kfreebsd_tests.patch -94_spelling.patch +hurd.patch +main_openssl_1.patch +scripts__mysqld_safe.sh__signals.patch +disable_tests.patch +mysql_va_list.patch +disable_rpl_tests.patch +fix_standalone_tests.patch +mysqlcheck_tests.patch +kfreebsd_tests.patch +spelling.patch diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch new file mode 100644 index 0000000..eaf9b3d --- /dev/null +++ b/debian/patches/spelling.patch @@ -0,0 +1,163 @@ +Author +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(rli), thd))) + { + const_cast(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(rli)->group_master_log_name, + llstr(const_cast(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 -- cgit v1.2.3