Patch for SCO

Update test results for MySQL 4.0


extra/resolveip.c:
  Fix for SCO
mysql-test/r/backup.result:
  Update test results for MySQL 4.0
mysql-test/r/bdb-crash.result:
  Update test results for MySQL 4.0
mysql-test/r/bdb-deadlock.result:
  Update test results for MySQL 4.0
mysys/mf_casecnv.c:
  Patch for SCO
mysys/mf_qsort.c:
  Patch for SCO
mysys/my_compress.c:
  Patch for SCO
strings/ctype.c:
  Patch for SCO

8 files changed, 40 insertions, 8 deletions

diff --git a/extra/resolveip.c b/extra/resolveip.c
index cb33e275b9d..8b2644ab423 100644
--- a/extra/resolveip.c
+++ b/extra/resolveip.c
@@ -23,7 +23,9 @@
 #include <m_ctype.h>
 #include <my_net.h>
 #include <my_sys.h>
+#ifndef SCO
 #include <m_string.h>
+#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #ifndef HAVE_BROKEN_NETINET_INCLUDES
diff --git a/mysql-test/r/backup.result b/mysql-test/r/backup.result
index ff7d17584bf..43d57d2d4f7 100644
--- a/mysql-test/r/backup.result
+++ b/mysql-test/r/backup.result
@@ -70,3 +70,4 @@ backup table t1 to '../tmp';
 unlock tables;
 Table	Op	Msg_type	Msg_text
 test.t1	backup	status	OK
+drop table t1;
diff --git a/mysql-test/r/bdb-crash.result b/mysql-test/r/bdb-crash.result
index 29d296a2c3f..42c826d55da 100644
--- a/mysql-test/r/bdb-crash.result
+++ b/mysql-test/r/bdb-crash.result
@@ -1,5 +1,5 @@
-drop table if exists tblChange;
-CREATE TABLE tblCharge (
+drop table if exists t1;
+CREATE TABLE t1 (
 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,
@@ -16,17 +16,17 @@ KEY ServiceID (ServiceID),
 KEY ChargeDate (ChargeDate)
 ) type=BDB;
 BEGIN;
-INSERT INTO tblCharge
+INSERT INTO t1
 VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now');
 COMMIT;
 BEGIN;
-UPDATE tblCharge SET ChargeAuthorizationMessage = 'blablabla' WHERE
+UPDATE t1 SET ChargeAuthorizationMessage = 'blablabla' WHERE
 ChargeID = 1;
 COMMIT;
-INSERT INTO tblCharge
+INSERT INTO t1
 VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now');
-select * from tblCharge;
+select * from t1;
 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
-drop table tblCharge;
+drop table t1;
diff --git a/mysql-test/r/bdb-deadlock.result b/mysql-test/r/bdb-deadlock.result
index 89077d16980..55b3d3ea2a5 100644
--- a/mysql-test/r/bdb-deadlock.result
+++ b/mysql-test/r/bdb-deadlock.result
@@ -1,10 +1,31 @@
+drop table if exists t1,t2;
+create table t1 (id integer, x integer) type=BDB;
+create table t2 (id integer, x integer) type=BDB;
+insert into t1 values(0, 0);
+insert into t2 values(0, 0);
+set autocommit=0;
+update t1 set x = 1 where id = 0;
+set autocommit=0;
+update t2 set x = 1 where id = 0;
+select x from t1 where id = 0;
+select x from t2 where id = 0;
+Deadlock found when trying to get lock; Try restarting transaction
+commit;
 x
 1
+commit;
+select * from t1;
 id	x
 0	1
+select * from t2;
 id	x
 0	1
+commit;
+select * from t1;
 id	x
 0	1
+select * from t2;
 id	x
 0	1
+commit;
+drop table t1,t2;
diff --git a/mysys/mf_casecnv.c b/mysys/mf_casecnv.c
index 2e0f5db83ff..ce4928cddb3 100644
--- a/mysys/mf_casecnv.c
+++ b/mysys/mf_casecnv.c
@@ -25,7 +25,9 @@
 
 #include "mysys_priv.h"
 #include <m_ctype.h>
+#ifndef SCO
 #include <m_string.h>
+#endif
 
 	/* string to uppercase */
 
diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c
index 3db6fae0520..be6e186f106 100644
--- a/mysys/mf_qsort.c
+++ b/mysys/mf_qsort.c
@@ -23,7 +23,9 @@
 
 
 #include "mysys_priv.h"
-#include "m_string.h"
+#ifndef SCO
+#include <m_string.h>
+#endif
 
 /* We need to use qsort with 2 different compare functions */
 #ifdef QSORT_EXTRA_CMP_ARGUMENT
diff --git a/mysys/my_compress.c b/mysys/my_compress.c
index f68c7607ed2..da8f7e8b9b6 100644
--- a/mysys/my_compress.c
+++ b/mysys/my_compress.c
@@ -20,7 +20,9 @@
 #include <my_global.h>
 #ifdef HAVE_COMPRESS
 #include <my_sys.h>
+#ifndef SCO
 #include <m_string.h>
+#endif
 #include <zlib.h>
 
 /*
diff --git a/strings/ctype.c b/strings/ctype.c
index dc827e1a471..4b9f816a4d3 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -17,7 +17,9 @@
 
 #include <my_global.h>
 #include <m_ctype.h>
+#ifndef SCO
 #include <m_string.h>
+#endif
 
 /* generated by make, using conf_to_src */
 #include "ctype_extra_sources.c"