Commit df764507 authored by unknown's avatar unknown
Browse files

Merge msdesk.(none):/home/msvensson/mysql-4.1 

into  msdesk.(none):/home/msvensson/mysql-5.0


BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74:
  Auto merged
innobase/os/os0sync.c:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_uca.test:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ctype_ujis.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
client/mysql.cc:
  Sam change in both 4.1 and 5.0
mysql-test/r/ctype_uca.result:
  Merge
mysql-test/r/ctype_ujis.result:
  Merge
strings/ctype-mb.c:
  Merge
strings/ctype-tis620.c:
  Merge
parents 3c2dca47 e6ec5794

innobase/os/os0sync.c

+15 −1
Original line number Diff line number Diff line
@@ -631,7 +631,21 @@ os_fast_mutex_free( 


	DeleteCriticalSection((LPCRITICAL_SECTION) fast_mutex);

#else

	ut_a(0 == pthread_mutex_destroy(fast_mutex));

	int	ret;

	

	ret = pthread_mutex_destroy(fast_mutex);



	if (ret != 0) {

		ut_print_timestamp(stderr);

		fprintf(stderr,

"  InnoDB: error: return value %lu when calling\n"

"InnoDB: pthread_mutex_destroy().\n", (ulint)ret);

		fprintf(stderr,

"InnoDB: Byte contents of the pthread mutex at %p:\n", fast_mutex);

		ut_print_buf(stderr, (const byte*)fast_mutex,

						sizeof(os_fast_mutex_t));

		fprintf(stderr, "\n");

	}

#endif

	if (os_sync_mutex_inited) {

		/* When freeing the last mutexes, we have

mysql-test/include/ctype_like_escape.inc

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#

# Bugs: #13046:

# LIKE pattern matching using prefix index doesn't return correct result

#

select @@collation_connection;

create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;

insert into t1 values('abcdef');

insert into t1 values('_bcdef');

insert into t1 values('a_cdef');

insert into t1 values('ab_def');

insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

-- should return ab_def

select c1 as c1u from t1 where c1 like 'ab\_def';

-- should return ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

drop table t1;

mysql-test/r/ctype_big5.result

+36 −0
Original line number Diff line number Diff line
@@ -89,6 +89,24 @@ select c1 from t1 where c1 like 'abcde111%' order by c1; 
c1

abcde111

drop table t1;

select @@collation_connection;

@@collation_connection

big5_chinese_ci

create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;

insert into t1 values('abcdef');

insert into t1 values('_bcdef');

insert into t1 values('a_cdef');

insert into t1 values('ab_def');

insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

select c1 as c1u from t1 where c1 like 'ab\_def';

c1u

ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

c2h

ab_def

drop table t1;

SET collation_connection='big5_bin';

create table t1 select repeat('a',4000) a;

delete from t1;
@@ -121,6 +139,24 @@ select c1 from t1 where c1 like 'abcde111%' order by c1; 
c1

abcde111

drop table t1;

select @@collation_connection;

@@collation_connection

big5_bin

create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;

insert into t1 values('abcdef');

insert into t1 values('_bcdef');

insert into t1 values('a_cdef');

insert into t1 values('ab_def');

insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

select c1 as c1u from t1 where c1 like 'ab\_def';

c1u

ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

c2h

ab_def

drop table t1;

SET NAMES big5;

CREATE TABLE t1 (a text) character set big5;

INSERT INTO t1 VALUES ('');

mysql-test/r/ctype_gbk.result

+36 −0
Original line number Diff line number Diff line
@@ -89,6 +89,24 @@ select c1 from t1 where c1 like 'abcde111%' order by c1; 
c1

abcde111

drop table t1;

select @@collation_connection;

@@collation_connection

gbk_chinese_ci

create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;

insert into t1 values('abcdef');

insert into t1 values('_bcdef');

insert into t1 values('a_cdef');

insert into t1 values('ab_def');

insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

select c1 as c1u from t1 where c1 like 'ab\_def';

c1u

ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

c2h

ab_def

drop table t1;

SET collation_connection='gbk_bin';

create table t1 select repeat('a',4000) a;

delete from t1;
@@ -121,6 +139,24 @@ select c1 from t1 where c1 like 'abcde111%' order by c1; 
c1

abcde111

drop table t1;

select @@collation_connection;

@@collation_connection

gbk_bin

create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;

insert into t1 values('abcdef');

insert into t1 values('_bcdef');

insert into t1 values('a_cdef');

insert into t1 values('ab_def');

insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

select c1 as c1u from t1 where c1 like 'ab\_def';

c1u

ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

c2h

ab_def

drop table t1;

SET NAMES gbk;

CREATE TABLE t1 (a text) character set gbk;

INSERT INTO t1 VALUES (0xA3A0),(0xA1A1);

mysql-test/r/ctype_latin1.result

+36 −0
Original line number Diff line number Diff line
@@ -315,6 +315,24 @@ latin1_swedish_ci 6109 
latin1_swedish_ci	61

latin1_swedish_ci	6120

drop table t1;

select @@collation_connection;

@@collation_connection

latin1_swedish_ci

create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;

insert into t1 values('abcdef');

insert into t1 values('_bcdef');

insert into t1 values('a_cdef');

insert into t1 values('ab_def');

insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

select c1 as c1u from t1 where c1 like 'ab\_def';

c1u

ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

c2h

ab_def

drop table t1;

SET collation_connection='latin1_bin';

create table t1 select repeat('a',4000) a;

delete from t1;
@@ -325,6 +343,24 @@ latin1_bin 6109 
latin1_bin	61

latin1_bin	6120

drop table t1;

select @@collation_connection;

@@collation_connection

latin1_bin

create table t1 ROW_FORMAT=DYNAMIC select repeat('a',50) as c1 ;

insert into t1 values('abcdef');

insert into t1 values('_bcdef');

insert into t1 values('a_cdef');

insert into t1 values('ab_def');

insert into t1 values('abc_ef');

insert into t1 values('abcd_f');

insert into t1 values('abcde_');

select c1 as c1u from t1 where c1 like 'ab\_def';

c1u

ab_def

select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';

c2h

ab_def

drop table t1;

CREATE TABLE a (a int);

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'a (a int)' at line 1

SELECT 'a' as str;