[Pkg-mysql-commits] r1056 - in branches/sid-5.0/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: 2007-12-10 10:18:20 +0000 (Mon, 10 Dec 2007)
New Revision: 1056

Added:
   branches/sid-5.0/debian/patches/51_mysqlcheck-result.dpatch
   branches/sid-5.0/debian/patches/51_mysqlcheck-test.dpatch
Modified:
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/patches/00list
Log:
Fix mysqlcheck test and result.

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-12-09 14:39:51 UTC (rev 1055)
+++ branches/sid-5.0/debian/changelog	2007-12-10 10:18:20 UTC (rev 1056)
@@ -18,11 +18,12 @@
     (patch from Edward Allcutt). (closes: #453127)
   * New patch to fix mysqldump because 'null' is shown as type of fields for
     view with bad definer. (closes: #454227)
+  * Two new patches (from 5.0.52) to fix mysqlcheck test and result.
   * New Finnish debconf translation from Esko Arajärvi. (closes: #448776)
   * Add Vcs-* and Homepage fields to source stanza in control file.
   * Update mysqlreport to 3.2 release.
 
- -- Norbert Tretkowski <nobse at debian.org>  Fri, 07 Dec 2007 10:14:16 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Mon, 10 Dec 2007 11:11:31 +0100
 
 mysql-dfsg-5.0 (5.0.45-4) unstable; urgency=high
 

Modified: branches/sid-5.0/debian/patches/00list
===================================================================
--- branches/sid-5.0/debian/patches/00list	2007-12-09 14:39:51 UTC (rev 1055)
+++ branches/sid-5.0/debian/patches/00list	2007-12-10 10:18:20 UTC (rev 1056)
@@ -8,6 +8,8 @@
 44_scripts__mysql_config__libs.dpatch
 45_warn-CLI-passwords.dpatch
 50_fix_mysqldump.dpatch
+51_mysqlcheck-result.dpatch
+51_mysqlcheck-test.dpatch
 86_PATH_MAX.dpatch
 88_mctype_attrib.dpatch
 89_ndb__staticlib.dpatch

Added: branches/sid-5.0/debian/patches/51_mysqlcheck-result.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/51_mysqlcheck-result.dpatch	                        (rev 0)
+++ branches/sid-5.0/debian/patches/51_mysqlcheck-result.dpatch	2007-12-10 10:18:20 UTC (rev 1056)
@@ -0,0 +1,49 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 51_mysqlcheck-result.dpatch by  <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- mysql-5.0.51/mysql-test/r/mysqlcheck.result	2007-11-15 15:28:37.000000000 +0100
++++ mysql-5.0.52/mysql-test/r/mysqlcheck.result	2007-11-30 08:06:41.000000000 +0100
+@@ -41,39 +41,4 @@
+ test.t1                                            OK
+ drop view v1;
+ drop table t1;
+-create database d_bug25347;
+-use d_bug25347;
+-create table t_bug25347 (a int);
+-create view v_bug25347 as select * from t_bug25347;
+-insert into t_bug25347 values (1),(2),(3);
+-flush tables;
+-removing and creating
+-d_bug25347.t_bug25347
+-error    : Incorrect file format 't_bug25347'
+-insert into t_bug25347 values (4),(5),(6);
+-ERROR HY000: Incorrect file format 't_bug25347'
+-d_bug25347.t_bug25347
+-warning  : Number of rows changed from 0 to 3
+-status   : OK
+-insert into t_bug25347 values (7),(8),(9);
+-select * from t_bug25347;
+-a
+-1
+-2
+-3
+-7
+-8
+-9
+-select * from v_bug25347;
+-a
+-1
+-2
+-3
+-7
+-8
+-9
+-drop view v_bug25347;
+-drop table t_bug25347;
+-drop database d_bug25347;
+-use test;
+ End of 5.0 tests

Added: branches/sid-5.0/debian/patches/51_mysqlcheck-test.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/51_mysqlcheck-test.dpatch	                        (rev 0)
+++ branches/sid-5.0/debian/patches/51_mysqlcheck-test.dpatch	2007-12-10 10:18:20 UTC (rev 1056)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 51_mysqlcheck-test.dpatch by  <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+--- mysql-5.0.51/mysql-test/t/mysqlcheck.test	2007-11-15 15:28:37.000000000 +0100
++++ mysql-5.0.52/mysql-test/t/mysqlcheck.test	2007-11-30 08:06:33.000000000 +0100
+@@ -31,29 +31,4 @@
+ drop view v1;
+ drop table t1;
+ 
+-#
+-# Bug#25347: mysqlcheck -A -r doesn't repair table marked as crashed
+-#
+-create database d_bug25347;
+-use d_bug25347;
+-create table t_bug25347 (a int);
+-create view v_bug25347 as select * from t_bug25347;
+-insert into t_bug25347 values (1),(2),(3);
+-flush tables;
+---echo removing and creating
+---remove_file $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI
+---write_file  $MYSQLTEST_VARDIR/master-data/d_bug25347/t_bug25347.MYI EOF
+-EOF
+---exec $MYSQL_CHECK --repair --databases d_bug25347
+---error 130
+-insert into t_bug25347 values (4),(5),(6);
+---exec $MYSQL_CHECK --repair --use-frm --databases d_bug25347
+-insert into t_bug25347 values (7),(8),(9);
+-select * from t_bug25347;
+-select * from v_bug25347;
+-drop view v_bug25347;
+-drop table t_bug25347;
+-drop database d_bug25347;
+-use test;
+-
+ --echo End of 5.0 tests