[Commits] Rev 3014: Merge in bug fix from 5.1 in lp:maria/5.2

Michael Widenius monty at askmonty.org
Mon Aug 15 20:43:00 EEST 2011


At lp:maria/5.2

------------------------------------------------------------
revno: 3014 [merge]
revision-id: monty at askmonty.org-20110815174229-wpoosuebqah0hjlc
parent: monty at askmonty.org-20110815174013-yj832agxi0b1r12b
parent: monty at askmonty.org-20110815173821-zbfrvyjijkstj8v4
committer: Michael Widenius <monty at askmonty.org>
branch nick: maria-5.2
timestamp: Mon 2011-08-15 20:42:29 +0300
message:
  Merge in bug fix from 5.1
added:
  mysql-test/suite/maria/r/locking.result locking.result-20110815173751-wqo3zl1k44x3p3od-1
  mysql-test/suite/maria/t/locking.test locking.test-20110815173751-wqo3zl1k44x3p3od-2
modified:
  storage/maria/ma_extra.c       sp1f-ma_extra.c-20060411134414-odsjlm2dvwmrpwdcyu3eqmkilaatl3gb
-------------- next part --------------
=== added file 'mysql-test/suite/maria/r/locking.result'
--- a/mysql-test/suite/maria/r/locking.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/maria/r/locking.result	2011-08-15 17:38:21 +0000
@@ -0,0 +1,31 @@
+drop table if exists t1;
+CREATE TABLE t1 (
+`Vorgangsnr` int(10) unsigned NOT NULL AUTO_INCREMENT,
+`Datum_Eingang` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Erfassungs-/Buchungsdatum',
+`Warennummer` varchar(20) DEFAULT NULL,
+`BenutzerID` int(10) unsigned DEFAULT NULL,
+`Vermerke_Versand` varchar(1024) DEFAULT NULL,
+`Zubeh?r` varchar(250) DEFAULT NULL,
+`Datum_Annahme` varchar(12) DEFAULT NULL,
+`K_Lieferscheinnummer` int(10) unsigned DEFAULT NULL,
+`RMANr` int(10) unsigned DEFAULT '0',
+`K_Bestelldaten` varchar(1024) DEFAULT NULL COMMENT 'Bestellnr, Datum, Auftraggeber',
+PRIMARY KEY (`Vorgangsnr`),
+KEY `Datum_Eingang` (`Datum_Eingang`)
+) ENGINE=Aria AUTO_INCREMENT=250 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
+alter table t1 disable keys;
+lock tables t1 write;
+INSERT INTO t1 (Datum_Eingang, BenutzerID, Zubeh?r, Datum_Annahme) VALUES ('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006');
+INSERT INTO t1 (Datum_Eingang, BenutzerID, Zubeh?r, Datum_Annahme) VALUES ('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006');
+unlock tables;
+select count(*) from t1;
+count(*)
+88
+check table t1 extended;
+Table   Op      Msg_type        Msg_text
+test.t1 check   status  OK
+alter table t1 enable keys;
+check table t1 extended;
+Table   Op      Msg_type        Msg_text
+test.t1 check   status  OK
+drop table t1;

=== added file 'mysql-test/suite/maria/t/locking.test'
--- a/mysql-test/suite/maria/t/locking.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/maria/t/locking.test	2011-08-15 17:38:21 +0000
@@ -0,0 +1,43 @@
+#
+# Aria bugs that has to do with locking
+#
+--source include/have_maria.inc
+
+disable_warnings;
+drop table if exists t1;
+enable_warnings;
+
+#
+# Test generating data with insert select
+#
+
+CREATE TABLE t1 (
+  `Vorgangsnr` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `Datum_Eingang` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'Erfassungs-/Buchungsdatum',
+  `Warennummer` varchar(20) DEFAULT NULL,
+  `BenutzerID` int(10) unsigned DEFAULT NULL,
+  `Vermerke_Versand` varchar(1024) DEFAULT NULL,
+  `Zubeh?r` varchar(250) DEFAULT NULL,
+  `Datum_Annahme` varchar(12) DEFAULT NULL,
+  `K_Lieferscheinnummer` int(10) unsigned DEFAULT NULL,
+  `RMANr` int(10) unsigned DEFAULT '0',
+  `K_Bestelldaten` varchar(1024) DEFAULT NULL COMMENT 'Bestellnr, Datum, Auftraggeber',
+  PRIMARY KEY (`Vorgangsnr`),
+  KEY `Datum_Eingang` (`Datum_Eingang`)
+) ENGINE=Aria AUTO_INCREMENT=250 DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC;
+
+alter table t1 disable keys;
+lock tables t1 write;
+
+let $loop=2;
+while ($loop)
+{
+  INSERT INTO t1 (Datum_Eingang, BenutzerID, Zubeh?r, Datum_Annahme) VALUES ('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006'),('2006-06-21 00:00:00', 713, 'ohne Zubeh?r', '21.06.2006');
+  dec $loop;
+}
+unlock tables;
+select count(*) from t1;
+check table t1 extended;
+alter table t1 enable keys;
+check table t1 extended;
+drop table t1;

=== modified file 'storage/maria/ma_extra.c'
--- a/storage/maria/ma_extra.c	2011-08-08 11:53:52 +0000
+++ b/storage/maria/ma_extra.c	2011-08-15 17:42:29 +0000
@@ -143,7 +143,7 @@ int maria_extra(MARIA_HA *info, enum ha_
           (READ_CACHE_USED | WRITE_CACHE_USED | OPT_NO_ROWS)) &&
         !share->state.header.uniques)
       if (!(init_io_cache(&info->rec_cache, info->dfile.file, cache_size,
-                         WRITE_CACHE,share->state.state.data_file_length,
+                          WRITE_CACHE, info->state->data_file_length,
                           (pbool) (info->lock_type != F_UNLCK),
                           MYF(share->write_flag & MY_WAIT_IF_FULL))))
       {



More information about the commits mailing list