Commit 88061984 authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/M41/mysql-4.1
parents ddab016f 5c5864dd

innobase/include/os0file.h

+3 −2
Original line number Diff line number Diff line
@@ -86,9 +86,10 @@ log. */ 
#define	OS_FILE_NOT_FOUND		71

#define	OS_FILE_DISK_FULL		72

#define	OS_FILE_ALREADY_EXISTS		73

#define OS_FILE_AIO_RESOURCES_RESERVED	74	/* wait for OS aio resources

#define	OS_FILE_PATH_ERROR		74

#define	OS_FILE_AIO_RESOURCES_RESERVED	75	/* wait for OS aio resources

						to become available again */

#define	OS_FILE_ERROR_NOT_SPECIFIED	75

#define	OS_FILE_ERROR_NOT_SPECIFIED	76



/* Types for aio operations */

#define OS_FILE_READ	10

innobase/os/os0file.c

+6 −2
Original line number Diff line number Diff line
@@ -303,6 +303,8 @@ os_file_get_last_error( 
		return(OS_FILE_NOT_FOUND);

	} else if (err == EEXIST) {

		return(OS_FILE_ALREADY_EXISTS);

	} else if (err == EXDEV || err == ENOTDIR || err == EISDIR) {

		return(OS_FILE_PATH_ERROR);

	} else {

		return(100 + err);

	}
@@ -352,7 +354,8 @@ os_file_handle_error( 


		return(TRUE);



	} else if (err == OS_FILE_ALREADY_EXISTS) {

	} else if (err == OS_FILE_ALREADY_EXISTS

			|| err == OS_FILE_PATH_ERROR) {



		return(FALSE);

	} else {
@@ -456,7 +459,8 @@ os_file_handle_error_no_exit( 


		return(TRUE);



	} else if (err == OS_FILE_ALREADY_EXISTS) {

	} else if (err == OS_FILE_ALREADY_EXISTS

			|| err == OS_FILE_PATH_ERROR) {



		return(FALSE);

	} else {

mysql-test/r/create.result

+5 −0
Original line number Diff line number Diff line
@@ -586,6 +586,11 @@ DESC t2; 
Field	Type	Null	Key	Default	Extra

f2	varchar(86)	YES		NULL	

DROP TABLE t1,t2;

CREATE TABLE t12913 (f1 ENUM ('a','b')) AS SELECT 'a' AS f1;

SELECT * FROM t12913;

f1

a

DROP TABLE t12913;

create database mysqltest;

use mysqltest;

drop database mysqltest;

mysql-test/r/ctype_ucs.result

+19 −0
Original line number Diff line number Diff line
@@ -684,3 +684,22 @@ select f1 from t1 where f1 like 'a%'; 
f1

a

drop table t1;

create table t1 (utext varchar(20) character set ucs2);

insert into t1 values ("lily");

insert into t1 values ("river");

prepare stmt from 'select utext from t1 where utext like ?';

set @param1='%%';

execute stmt using @param1;

utext

lily

river

execute stmt using @param1;

utext

lily

river

select utext from t1 where utext like '%%';

utext

lily

river

drop table t1;

deallocate prepare stmt;

mysql-test/r/innodb.result

+40 −0
Original line number Diff line number Diff line
@@ -1754,3 +1754,43 @@ rename table t3 to t1; 
ERROR HY000: Error on rename of './test/t3' to './test/t1' (errno: 150)

set foreign_key_checks=1;

drop table t2,t3;

create table t2 (

a int, b char(10), filler char(10), primary key(a, b(2)) 

) character set utf8 engine = innodb;

insert into t2 values (1,'abcdefg','one');

insert into t2 values (2,'ijkilmn','two');

insert into t2 values (3, 'qrstuvw','three');

update t2 set a=5, filler='booo' where a=1;

drop table t2;

create table t2 (

a int, b char(10), filler char(10), primary key(a, b(2)) 

) character set ucs2 engine = innodb;

insert into t2 values (1,'abcdefg','one');

insert into t2 values (2,'ijkilmn','two');

insert into t2 values (3, 'qrstuvw','three');

update t2 set a=5, filler='booo' where a=1;

drop table t2;

create table t1(a int not null, b char(110),primary key(a,b(100))) engine=innodb default charset=utf8;

insert into t1 values(1,'abcdefg'),(2,'defghijk');

insert into t1 values(6,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1);

insert into t1 values(7,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2);

select a,hex(b) from t1 order by b;

a	hex(b)

1	61626364656667

2	6465666768696A6B

6	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1

7	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2

update t1 set b = 'three' where a = 6;

drop table t1;

create table t1(a int not null, b text(110),primary key(a,b(100))) engine=innodb default charset=utf8;

insert into t1 values(1,'abcdefg'),(2,'defghijk');

insert into t1 values(6,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1);

insert into t1 values(7,_utf8 0xD0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2);

select a,hex(b) from t1 order by b;

a	hex(b)

1	61626364656667

2	6465666768696A6B

6	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1

7	D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B1D0B2

update t1 set b = 'three' where a = 6;

drop table t1;