Merge

Docs/manual.texi:
  Auto merged
mysql-test/t/fulltext.test:
  merged

9 files changed, 72 insertions, 8 deletions

diff --git a/Docs/Support/test-make-manual b/Docs/Support/test-make-manual
index fb88410116b..822b9ff1e08 100755
--- a/Docs/Support/test-make-manual
+++ b/Docs/Support/test-make-manual
@@ -129,6 +129,8 @@ echo "If you would like to use a different browser, set the 'BROWSER' environmen
 echo "variable." 
 echo
 
-$BROWSER file://`pwd`/manual_toc.html
+$BROWSER file:`pwd`/manual_toc.html
 
+echo "-- Press Enter to Continue --"
+read
 cleanup
diff --git a/Docs/manual.texi b/Docs/manual.texi
index 39e0c8dd0be..69c1d8ad797 100644
--- a/Docs/manual.texi
+++ b/Docs/manual.texi
@@ -4320,6 +4320,12 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
 @uref{http://mysql.silverpoint.nl/, WWW}
 
 @item
+@c EMAIL: mysql@widexs.nl (Wouter de Jong)
+@image{Flags/netherlands} Netherlands [Widexs BV] @
+@uref{http://mysql.widexs.nl/, WWW}
+@uref{ftp://mysql.widexs.nl/pub/mysql/, FTP}
+
+@item
 @c EMAIL: W.Sylwestrzak@icm.edu.pl (Wojtek Sylwestrzak)
 @c mirroring nightly at 05:25
 @image{Flags/poland} Poland [Sunsite] @
@@ -4435,11 +4441,11 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
 @uref{http://ftp.plig.org/pub/mysql/, WWW}
 @uref{ftp://ftp.plig.org/pub/mysql/, FTP}
 
-@item
+@c @item
 @c lance@uklinux.net (Lance)
-@image{Flags/great-britain} UK [uklinux.net] @
-@uref{http://mirror.uklinux.net/mysql/, WWW}
-@uref{ftp://mirror.uklinux.net/pub/mysql/, FTP}
+@c @image{Flags/great-britain} UK [uklinux.net] @
+@c @uref{http://mirror.uklinux.net/mysql/, WWW}
+@c @uref{ftp://mirror.uklinux.net/pub/mysql/, FTP}
 
 @c @item
 @c unknown
@@ -40600,6 +40606,7 @@ for all MySQL fieldtypes (version 2001.1.1). By SciBit @uref{http://www.scibit.c
 @item @uref{http://www.fastflow.it/mylua/, MyLUA home page}
 How to use the LUA language to write @strong{MySQL} @code{PROCEDURE} that can
 be loaded runtime.
+
 @itemize @bullet
 @item @uref{http://www.mysql.com/Downloads/Contrib/lua-4.0.tar.gz, Lua 4.0}
 LUA 4.0
@@ -40607,6 +40614,10 @@ LUA 4.0
 Patch for MySQL 3.23.32 to use LUA 4.0.  By Cristian Giussani.
 @end itemize
 
+@item @uref{http://www.mysql.com/Downloads/Contrib/patched_myodbc.zip, patched_myodbc.zip}
+Patch (for Omniform 4.0 support) to the MyODBC driver.
+By Thomas Thaele @email{tthaele@@papenmeier.de}
+
 @end itemize
 
 @appendixsec  Clients
diff --git a/innobase/include/os0file.h b/innobase/include/os0file.h
index 6ec8c69594a..0960cf32105 100644
--- a/innobase/include/os0file.h
+++ b/innobase/include/os0file.h
@@ -29,7 +29,6 @@ Created 10/21/1995 Heikki Tuuri
 #endif
 
 #ifndef S_IRUSR
-#define 
 #define S_IRUSR 00400
 #define S_IWUSR 00200
 #define S_IRGRP 00040
diff --git a/mysql-test/r/bdb-crash.result b/mysql-test/r/bdb-crash.result
new file mode 100644
index 00000000000..8fa8378640b
--- /dev/null
+++ b/mysql-test/r/bdb-crash.result
@@ -0,0 +1,3 @@
+ChargeID	ServiceID	ChargeDate	ChargeAmount	FedTaxes	ProvTaxes	ChargeStatus	ChargeAuthorizationMessage	ChargeComment	ChargeTimeStamp
+1	1	2001-03-01	1.00	1.00	1.00	New	blablabla	NULL	now
+2	1	2001-03-01	1.00	1.00	1.00	New	NULL	NULL	now
diff --git a/mysql-test/t/bdb-crash.test b/mysql-test/t/bdb-crash.test
new file mode 100644
index 00000000000..05ab7260d23
--- /dev/null
+++ b/mysql-test/t/bdb-crash.test
@@ -0,0 +1,34 @@
+# test for bug reported by Mark Steele
+
+drop table if exists tblChange;
+CREATE TABLE tblCharge (
+  ChargeID int(10) unsigned DEFAULT '0' NOT NULL auto_increment,
+  ServiceID int(10) unsigned DEFAULT '0' NOT NULL,
+  ChargeDate date DEFAULT '0000-00-00' NOT NULL,
+  ChargeAmount decimal(20,2) DEFAULT '0.00' NOT NULL,
+  FedTaxes decimal(20,2) DEFAULT '0.00' NOT NULL,
+  ProvTaxes decimal(20,2) DEFAULT '0.00' NOT NULL,
+  ChargeStatus enum('New','Auth','Unauth','Sale','Denied','Refund')
+DEFAULT 'New' NOT NULL,
+  ChargeAuthorizationMessage text,
+  ChargeComment text,
+  ChargeTimeStamp varchar(20),
+  PRIMARY KEY (ChargeID),
+  KEY ServiceID (ServiceID),
+  KEY ChargeDate (ChargeDate)
+) type=BDB;
+
+BEGIN;
+INSERT INTO tblCharge
+VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now');
+COMMIT;
+
+BEGIN;
+UPDATE tblCharge SET ChargeAuthorizationMessage = 'blablabla' WHERE
+ChargeID = 1;
+COMMIT;
+
+INSERT INTO tblCharge
+VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now');
+select * from tblCharge;
+drop table tblCharge;
diff --git a/mysql-test/t/bdb.test b/mysql-test/t/bdb.test
index b3bb76dee34..72fbbe1dafa 100644
--- a/mysql-test/t/bdb.test
+++ b/mysql-test/t/bdb.test
@@ -428,3 +428,5 @@ select * from t1 where i=1 and j=2;
 create index ax1 on t1 (i,j);
 select * from t1 where i=1 and j=2;
 drop table t1;
+
+
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 5535e422db8..6614a81a94c 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -54,4 +54,3 @@ show create table t2;
 select * from t2 where MATCH inhalt AGAINST (NULL);
 
 drop table t1,t2;
-
diff --git a/sql/field.cc b/sql/field.cc
index 17717b14649..a5eca021695 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -4075,8 +4075,8 @@ char *Field_blob::pack(char *to, const char *from, uint max_length)
 const char *Field_blob::unpack(char *to, const char *from)
 {
   memcpy(to,from,packlength);
+  ulong length=get_length(from);
   from+=packlength;
-  ulong length=get_length();
   if (length)
     memcpy_fixed(to+packlength, &from, sizeof(from));
   else
diff --git a/sql/ha_innobase.cc b/sql/ha_innobase.cc
index 7e83718294a..197a46c06cd 100644
--- a/sql/ha_innobase.cc
+++ b/sql/ha_innobase.cc
@@ -1222,7 +1222,21 @@ ha_innobase::write_row(
     	}
 
   	if (table->next_number_field && record == table->record[0]) {
+	        /* Set the 'in_update_remember_pos' flag to FALSE to
+	        make sure all columns are fetched in the select done by
+	        update_auto_increment */
+
+	        prebuilt->in_update_remember_pos = FALSE;
+
     		update_auto_increment();
+
+		/* We have to set sql_stat_start to TRUE because
+		update_auto_increment has called a select, and
+		has reset that flag; row_insert_for_mysql has to
+		know to set the IX intention lock on the table, something
+		it only does at the start of each statement */
+
+		prebuilt->sql_stat_start = TRUE;
     	}
 
 	if (prebuilt->mysql_template == NULL