Commit 883b2229 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl


sql/sql_class.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/innodb_mysql.test:
  Manual merge
sql/log.cc:
  Manual merge
sql/set_var.cc:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_class.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
parents c4e26cb0 36815fa1

mysql-test/r/create.result

+0 −6
Original line number Diff line number Diff line
@@ -772,9 +772,3 @@ t1 CREATE TABLE `t1` ( 
  `i` int(11) DEFAULT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295

drop table t1;
 
create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

character set utf8 collate utf8_general_ci;

Warnings:

Warning	1071	Specified key was too long; max key length is 765 bytes

insert into t1 values('aaa');

drop table t1;

mysql-test/r/innodb_mysql.result

+6 −0
Original line number Diff line number Diff line 
drop table if exists t1,t2;

create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

character set utf8 collate utf8_general_ci;

Warnings:

Warning	1071	Specified key was too long; max key length is 765 bytes

insert into t1 values('aaa');

drop table t1;

create table t1 (

c_id int(11) not null default '0',

org_id int(11) default null,

mysql-test/t/create.test

+0 −8
Original line number Diff line number Diff line
@@ -667,12 +667,4 @@ alter table t1 max_rows=100000000000; 
show create table t1;

drop table t1;



#

# Bug#17530: Incorrect key truncation on table creation caused server crash.

#

create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

  character set utf8 collate utf8_general_ci;

insert into t1 values('aaa');

drop table t1;



# End of 5.0 tests

mysql-test/t/innodb_mysql.test

+8 −0
Original line number Diff line number Diff line
@@ -4,6 +4,14 @@ 
drop table if exists t1,t2;

--enable_warnings



#

# Bug#17530: Incorrect key truncation on table creation caused server crash.

#

create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 

  character set utf8 collate utf8_general_ci;

insert into t1 values('aaa');

drop table t1;



# BUG#16798: Uninitialized row buffer reads in ref-or-null optimizer

# (repeatable only w/innodb).

create table t1 (

mysql-test/t/rpl_rbr_to_sbr.test

+1 −0
Original line number Diff line number Diff line 
-- source include/have_row_based.inc

-- source include/have_binlog_format_statement.inc

-- source include/master-slave.inc