1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch for SCO

Browse Source 
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
This commit is contained in:
unknown 2001-11-26 03:52:23 +02:00
parent 00d82156b2
commit f33fb18677
8 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/resolveip.c
View File

@ -23,7 +23,9 @@
#include <m_ctype.h> #include <m_ctype.h>
#include <my_net.h> #include <my_net.h>
#include <my_sys.h> #include <my_sys.h>
#ifndef SCO
#include <m_string.h> #include <m_string.h>
#endif
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#ifndef HAVE_BROKEN_NETINET_INCLUDES #ifndef HAVE_BROKEN_NETINET_INCLUDES

1
mysql-test/r/backup.result
View File

@ -70,3 +70,4 @@ backup table t1 to '../tmp';
unlock tables; unlock tables;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 backup status OK test.t1 backup status OK
drop table t1;

14
mysql-test/r/bdb-crash.result
View File

@ -1,5 +1,5 @@
drop table if exists tblChange; drop table if exists t1;
CREATE TABLE tblCharge ( CREATE TABLE t1 (
ChargeID int(10) unsigned DEFAULT '0' NOT NULL auto_increment, ChargeID int(10) unsigned DEFAULT '0' NOT NULL auto_increment,
ServiceID int(10) unsigned DEFAULT '0' NOT NULL, ServiceID int(10) unsigned DEFAULT '0' NOT NULL,
ChargeDate date DEFAULT '0000-00-00' NOT NULL, ChargeDate date DEFAULT '0000-00-00' NOT NULL,
@ -16,17 +16,17 @@ KEY ServiceID (ServiceID),
KEY ChargeDate (ChargeDate) KEY ChargeDate (ChargeDate)
) type=BDB; ) type=BDB;
BEGIN; BEGIN;
INSERT INTO tblCharge INSERT INTO t1
VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now'); VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now');
COMMIT; COMMIT;
BEGIN; BEGIN;
UPDATE tblCharge SET ChargeAuthorizationMessage = 'blablabla' WHERE UPDATE t1 SET ChargeAuthorizationMessage = 'blablabla' WHERE
ChargeID = 1; ChargeID = 1;
COMMIT; COMMIT;
INSERT INTO tblCharge INSERT INTO t1
VALUES(NULL,1,'2001-03-01',1,1,1,'New',NULL,NULL,'now'); 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 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 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 2 1 2001-03-01 1.00 1.00 1.00 New NULL NULL now
drop table tblCharge; drop table t1;

21
mysql-test/r/bdb-deadlock.result
View File

@ -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 x
1 1
commit;
select * from t1;
id x id x
0 1 0 1
select * from t2;
id x id x
0 1 0 1
commit;
select * from t1;
id x id x
0 1 0 1
select * from t2;
id x id x
0 1 0 1
commit;
drop table t1,t2;

2
mysys/mf_casecnv.c
View File

@ -25,7 +25,9 @@
#include "mysys_priv.h" #include "mysys_priv.h"
#include <m_ctype.h> #include <m_ctype.h>
#ifndef SCO
#include <m_string.h> #include <m_string.h>
#endif
/* string to uppercase */ /* string to uppercase */

4
mysys/mf_qsort.c
View File

@ -23,7 +23,9 @@
#include "mysys_priv.h" #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 */ /* We need to use qsort with 2 different compare functions */
#ifdef QSORT_EXTRA_CMP_ARGUMENT #ifdef QSORT_EXTRA_CMP_ARGUMENT

2
mysys/my_compress.c
View File

@ -20,7 +20,9 @@
#include <my_global.h> #include <my_global.h>
#ifdef HAVE_COMPRESS #ifdef HAVE_COMPRESS
#include <my_sys.h> #include <my_sys.h>
#ifndef SCO
#include <m_string.h> #include <m_string.h>
#endif
#include <zlib.h> #include <zlib.h>
/* /*

2
strings/ctype.c
View File

@ -17,7 +17,9 @@
#include <my_global.h> #include <my_global.h>
#include <m_ctype.h> #include <m_ctype.h>
#ifndef SCO
#include <m_string.h> #include <m_string.h>
#endif
/* generated by make, using conf_to_src */ /* generated by make, using conf_to_src */
#include "ctype_extra_sources.c" #include "ctype_extra_sources.c"