Commit 11dbbd08 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  chilla.local:/home/mydev/mysql-5.1-axmrg


configure.in:
  Auto merged
parents e54bbaa3 bf2e7002

mysql-test/r/federated.result

+28 −0
Original line number Diff line number Diff line
@@ -1815,6 +1815,34 @@ engine = federated 
connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/test';

drop table federated.test1, federated.test2;

drop table federated.test;

set names utf8;

create table federated.t1 (a varchar(64)) DEFAULT CHARSET=utf8;

insert into federated.t1 values (0x6DC3A56E6164);

select hex(a) from federated.t1;

hex(a)

6DC3A56E6164

create table federated.t1 (a varchar(64))

ENGINE=FEDERATED 

connection='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1'

DEFAULT CHARSET=utf8;

set names utf8;

select hex(a) from federated.t1;

hex(a)

6DC3A56E6164

insert into federated.t1 values (0xC3A4C3B6C3BCC39F);

insert into federated.t1 values (0xD18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E);

select hex(a) from federated.t1;

hex(a)

6DC3A56E6164

C3A4C3B6C3BCC39F

D18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E

select hex(a) from federated.t1;

hex(a)

6DC3A56E6164

C3A4C3B6C3BCC39F

D18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E

drop table federated.t1;

drop table federated.t1;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

mysql-test/r/myisam.result

+45 −0
Original line number Diff line number Diff line
@@ -1757,4 +1757,49 @@ create table t1 (a int not null, key key_block_size=1024 (a)); 
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 '=1024 (a))' at line 1

create table t1 (a int not null, key `a` key_block_size=1024 (a));

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 'key_block_size=1024 (a))' at line 1

CREATE TABLE t1 (

c1 INT,

c2 VARCHAR(300),

KEY (c1) KEY_BLOCK_SIZE 1024,

KEY (c2) KEY_BLOCK_SIZE 8192

);

INSERT INTO t1 VALUES (10, REPEAT('a', CEIL(RAND(10) * 300))),

(11, REPEAT('b', CEIL(RAND() * 300))),

(12, REPEAT('c', CEIL(RAND() * 300))),

(13, REPEAT('d', CEIL(RAND() * 300))),

(14, REPEAT('e', CEIL(RAND() * 300))),

(15, REPEAT('f', CEIL(RAND() * 300))),

(16, REPEAT('g', CEIL(RAND() * 300))),

(17, REPEAT('h', CEIL(RAND() * 300))),

(18, REPEAT('i', CEIL(RAND() * 300))),

(19, REPEAT('j', CEIL(RAND() * 300))),

(20, REPEAT('k', CEIL(RAND() * 300))),

(21, REPEAT('l', CEIL(RAND() * 300))),

(22, REPEAT('m', CEIL(RAND() * 300))),

(23, REPEAT('n', CEIL(RAND() * 300))),

(24, REPEAT('o', CEIL(RAND() * 300))),

(25, REPEAT('p', CEIL(RAND() * 300))),

(26, REPEAT('q', CEIL(RAND() * 300))),

(27, REPEAT('r', CEIL(RAND() * 300))),

(28, REPEAT('s', CEIL(RAND() * 300))),

(29, REPEAT('t', CEIL(RAND() * 300))),

(30, REPEAT('u', CEIL(RAND() * 300))),

(31, REPEAT('v', CEIL(RAND() * 300))),

(32, REPEAT('w', CEIL(RAND() * 300))),

(33, REPEAT('x', CEIL(RAND() * 300))),

(34, REPEAT('y', CEIL(RAND() * 300))),

(35, REPEAT('z', CEIL(RAND() * 300)));

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

CHECK TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

REPAIR TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	repair	status	OK

DELETE FROM t1 WHERE c1 >= 10;

CHECK TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

DROP TABLE t1;

End of 5.1 tests

mysql-test/t/federated.test

+32 −0
Original line number Diff line number Diff line
@@ -1598,4 +1598,36 @@ drop table federated.test1, federated.test2; 
connection slave;

drop table federated.test;



#

# BUG# 17044 Federated Storage Engine not UTF8 clean

#

connection slave;

set names utf8;

create table federated.t1 (a varchar(64)) DEFAULT CHARSET=utf8;



insert into federated.t1 values (0x6DC3A56E6164);

select hex(a) from federated.t1;



connection master;

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval create table federated.t1 (a varchar(64))

ENGINE=FEDERATED 

connection='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1'

DEFAULT CHARSET=utf8;

set names utf8;

select hex(a) from federated.t1;

insert into federated.t1 values (0xC3A4C3B6C3BCC39F);

insert into federated.t1 values (0xD18DD184D184D0B5D0BAD182D0B8D0B2D0BDD183D18E);

select hex(a) from federated.t1;



connection slave;

select hex(a) from federated.t1;



connection master;

drop table federated.t1;



connection slave;

drop table federated.t1;





source include/federated_cleanup.inc;

mysql-test/t/myisam.test

+43 −0
Original line number Diff line number Diff line
@@ -1054,4 +1054,47 @@ create table t1 (a int not null, key key_block_size=1024 (a)); 
--error 1064

create table t1 (a int not null, key `a` key_block_size=1024 (a));



#

# Bug#22119 - Changing MI_KEY_BLOCK_LENGTH makes a wrong myisamchk

#

CREATE TABLE t1 (

  c1 INT,

  c2 VARCHAR(300),

  KEY (c1) KEY_BLOCK_SIZE 1024,

  KEY (c2) KEY_BLOCK_SIZE 8192

  );

INSERT INTO t1 VALUES (10, REPEAT('a', CEIL(RAND(10) * 300))),

  (11, REPEAT('b', CEIL(RAND() * 300))),

  (12, REPEAT('c', CEIL(RAND() * 300))),

  (13, REPEAT('d', CEIL(RAND() * 300))),

  (14, REPEAT('e', CEIL(RAND() * 300))),

  (15, REPEAT('f', CEIL(RAND() * 300))),

  (16, REPEAT('g', CEIL(RAND() * 300))),

  (17, REPEAT('h', CEIL(RAND() * 300))),

  (18, REPEAT('i', CEIL(RAND() * 300))),

  (19, REPEAT('j', CEIL(RAND() * 300))),

  (20, REPEAT('k', CEIL(RAND() * 300))),

  (21, REPEAT('l', CEIL(RAND() * 300))),

  (22, REPEAT('m', CEIL(RAND() * 300))),

  (23, REPEAT('n', CEIL(RAND() * 300))),

  (24, REPEAT('o', CEIL(RAND() * 300))),

  (25, REPEAT('p', CEIL(RAND() * 300))),

  (26, REPEAT('q', CEIL(RAND() * 300))),

  (27, REPEAT('r', CEIL(RAND() * 300))),

  (28, REPEAT('s', CEIL(RAND() * 300))),

  (29, REPEAT('t', CEIL(RAND() * 300))),

  (30, REPEAT('u', CEIL(RAND() * 300))),

  (31, REPEAT('v', CEIL(RAND() * 300))),

  (32, REPEAT('w', CEIL(RAND() * 300))),

  (33, REPEAT('x', CEIL(RAND() * 300))),

  (34, REPEAT('y', CEIL(RAND() * 300))),

  (35, REPEAT('z', CEIL(RAND() * 300)));

INSERT INTO t1 SELECT * FROM t1;

INSERT INTO t1 SELECT * FROM t1;

CHECK TABLE t1;

REPAIR TABLE t1;

DELETE FROM t1 WHERE c1 >= 10;

CHECK TABLE t1;

DROP TABLE t1;



--echo End of 5.1 tests

sql/sql_insert.cc

+0 −3
Original line number Diff line number Diff line
@@ -1808,8 +1808,6 @@ void kill_delayed_threads(void) 
  delayed_insert *tmp;

  while ((tmp=it++))

  {

    /* Ensure that the thread doesn't kill itself while we are looking at it */

    pthread_mutex_lock(&tmp->mutex);

    tmp->thd.killed= THD::KILL_CONNECTION;

    if (tmp->thd.mysys_var)

    {
@@ -1828,7 +1826,6 @@ void kill_delayed_threads(void) 
      }

      pthread_mutex_unlock(&tmp->thd.mysys_var->mutex);

    }

    pthread_mutex_unlock(&tmp->mutex);

  }

  VOID(pthread_mutex_unlock(&LOCK_delayed_insert)); // For unlink from list

}