Commit 610b1a4e authored by unknown's avatar unknown
Browse files

Manually merged 


configure.in:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/r/replace.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/delayed.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
parents 60a9c875 9ec3f63f

mysql-test/extra/rpl_tests/rpl_log.test

+15 −0
Original line number Diff line number Diff line
@@ -125,6 +125,21 @@ show slave status; 
--error 1220

show binlog events in 'slave-bin.000005' from 4;



#

# Bug #6880: LAST_INSERT_ID() within a statement

#



create table t1(a int auto_increment primary key, b int);

insert into t1 values (NULL, 1);

reset master;

set insert_id=5;

insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());

--replace_result $VERSION VERSION

show binlog events;

select * from t1;

drop table t1;



# End of 4.1 tests

# The table drops caused Cluster Replication wrapper to fail as event ID would never be the same.# Moving drops here.



DROP TABLE t1;

mysql-test/r/archive.result

+2 −0
Original line number Diff line number Diff line
@@ -6254,6 +6254,7 @@ auto fld1 companynr fld3 fld4 fld5 fld6 
3	011402	37	Romans	scholastics	jarring	

4	011403	37	intercepted	audiology	tinily	

DELETE FROM t2;

ERROR HY000: Table storage engine for 't2' doesn't have this option

SELECT * FROM t2;

auto	fld1	companynr	fld3	fld4	fld5	fld6

1	000001	00	Omaha	teethe	neat
@@ -8685,6 +8686,7 @@ auto fld1 companynr fld3 fld4 fld5 fld6 
3	011402	37	Romans	scholastics	jarring	

4	011403	37	intercepted	audiology	tinily	

TRUNCATE TABLE t2;

ERROR HY000: Table storage engine for 't2' doesn't have this option

SELECT * FROM t2;

auto	fld1	companynr	fld3	fld4	fld5	fld6

1	000001	00	Omaha	teethe	neat

mysql-test/r/auto_increment.result

+22 −0
Original line number Diff line number Diff line
@@ -378,6 +378,28 @@ t1 CREATE TABLE `t1` ( 
  KEY `t1_name` (`t1_name`)

) ENGINE=MyISAM AUTO_INCREMENT=1003 DEFAULT CHARSET=latin1

DROP TABLE `t1`;

create table t1(a int not null auto_increment primary key);

create table t2(a int not null auto_increment primary key, t1a int);

insert into t1 values(NULL);

insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID());

insert into t1 values (NULL);

insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID()),

(NULL, LAST_INSERT_ID());

insert into t1 values (NULL);

insert into t2 values (NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID()),

(NULL, LAST_INSERT_ID()), (NULL, LAST_INSERT_ID());

select * from t2;

a	t1a

1	1

2	1

3	2

4	2

5	2

6	3

7	3

8	3

9	3

drop table t1, t2;

End of 4.1 tests

CREATE TABLE t1 ( `a` int(11) NOT NULL auto_increment, `b` int(11) default NULL,PRIMARY KEY  (`a`),UNIQUE KEY `b` (`b`));

insert into t1 (b) values (1);

mysql-test/r/ctype_utf8.result

+40 −0
Original line number Diff line number Diff line
@@ -1112,6 +1112,46 @@ check table t1; 
Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

drop table t1;

SET NAMES utf8;

CREATE TABLE t1 (id int PRIMARY KEY,

a varchar(16) collate utf8_unicode_ci NOT NULL default '',

b int,

f varchar(128) default 'XXX',

INDEX (a(4))

) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

INSERT INTO t1(id, a, b) VALUES

(1, 'cccc', 50), (2, 'cccc', 70), (3, 'cccc', 30),

(4, 'cccc', 30), (5, 'cccc', 20), (6, 'bbbbbb', 40),

(7, 'dddd', 30), (8, 'aaaa', 10), (9, 'aaaa', 50),

(10, 'eeeee', 40), (11, 'bbbbbb', 60);

SELECT id, a, b FROM t1;

id	a	b

1	cccc	50

2	cccc	70

3	cccc	30

4	cccc	30

5	cccc	20

6	bbbbbb	40

7	dddd	30

8	aaaa	10

9	aaaa	50

10	eeeee	40

11	bbbbbb	60

SELECT id, a, b FROM t1 WHERE a BETWEEN 'aaaa' AND 'bbbbbb';

id	a	b

8	aaaa	10

9	aaaa	50

6	bbbbbb	40

11	bbbbbb	60

SELECT id, a FROM t1 WHERE a='bbbbbb';

id	a

6	bbbbbb

11	bbbbbb

SELECT id, a FROM t1 WHERE a='bbbbbb' ORDER BY b;

id	a

6	bbbbbb

11	bbbbbb

DROP TABLE t1;

CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;

INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');

SELECT id FROM t1;

mysql-test/r/delayed.result

+30 −0
Original line number Diff line number Diff line
@@ -39,3 +39,33 @@ select * from t1; 
a

1

drop table t1;

CREATE TABLE t1 ( a int(10) NOT NULL auto_increment, PRIMARY KEY (a));

insert delayed into t1 values(null);

insert into t1 values(null);

insert into t1 values(null);

insert delayed into t1 values(null);

insert delayed into t1 values(null);

insert delayed into t1 values(null);

insert into t1 values(null);

insert into t1 values(null);

insert into t1 values(null);

delete from t1 where a=6;

insert delayed into t1 values(null);

insert delayed into t1 values(null);

insert delayed into t1 values(null);

insert delayed into t1 values(null);

select * from t1 order by a;

a

1

2

3

4

5

7

8

9

10

11

12

13

DROP TABLE t1;