Commit aac43a28 authored by tsmith@ramayana.hindu.god's avatar tsmith@ramayana.hindu.god
Browse files

Merge ramayana.hindu.god:/home/tsmith/m/bk/51 

into  ramayana.hindu.god:/home/tsmith/m/bk/build/mrg12dec/51
parents 0e0be30b 8506efa9

include/myisammrg.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ typedef struct st_myrg_info 
  LIST	 open_list;

  QUEUE  by_key;

  ulong *rec_per_key_part;			/* for sql optimizing */

  pthread_mutex_t mutex;

} MYRG_INFO;

mysql-test/extra/binlog_tests/ctype_cp932.test

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,10 @@ drop table if exists t3; 
drop table if exists t4;

--enable_warnings



SET @test_character_set= 'cp932';

SET @test_collation= 'cp932_japanese_ci';

-- source include/ctype_common.inc



set names cp932;

set character_set_database = cp932;

mysql-test/include/ctype_common.inc

+2 −0
Original line number Diff line number Diff line
@@ -53,11 +53,13 @@ DROP TABLE t1; 


#

# Bug #31070: crash during conversion of charsets

# Bug #32726: crash with cast in order by clause and cp932 charset

#

create table t1 (a set('a') not null);

insert into t1 values (),();

select cast(a as char(1)) from t1;

select a sounds like a from t1;

select 1 from t1 order by cast(a as char(1));

drop table t1;



DROP DATABASE d1;

mysql-test/r/archive.result

+7 −0
Original line number Diff line number Diff line
@@ -12687,3 +12687,10 @@ CREATE TABLE t1(a VARCHAR(510)) ENGINE = ARCHIVE; 
INSERT INTO t1(a) VALUES ('');

SELECT * FROM t1 ORDER BY a;

DROP TABLE t1;

CREATE TABLE t1(a INT NOT NULL AUTO_INCREMENT, b BLOB, KEY(a)) ENGINE=archive;

INSERT INTO t1 VALUES (NULL, NULL),(NULL, NULL);

FLUSH TABLE t1;

SELECT * FROM t1 ORDER BY a;

a	b

1	NULL

2	NULL

mysql-test/r/csv.result

+8 −2
Original line number Diff line number Diff line
@@ -5364,13 +5364,19 @@ BIN(a) 
0

drop table t1;

create table t1(a enum('foo','bar') default null) engine=csv;

ERROR HY000: Can't create table 'test.t1' (errno: -1)

ERROR 42000: The storage engine for the table doesn't support nullable columns

create table t1(a enum('foo','bar') default 'foo') engine=csv;

ERROR HY000: Can't create table 'test.t1' (errno: -1)

ERROR 42000: The storage engine for the table doesn't support nullable columns

create table t1(a enum('foo','bar') default 'foo' not null) engine=csv;

insert into t1 values();

select * from t1;

a

foo

drop table t1;

CREATE TABLE t1(a INT) ENGINE=CSV;

ERROR 42000: The storage engine for the table doesn't support nullable columns

SHOW WARNINGS;

Level	Code	Message

Error	1178	The storage engine for the table doesn't support nullable columns

Error	1005	Can't create table 'test.t1' (errno: 138)

End of 5.1 tests