Commit 36fcc9c6 authored by unknown's avatar unknown
Browse files

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.1
parents ee4db475 8d0275b3

Makefile.am

+17 −2
Original line number Diff line number Diff line
@@ -97,7 +97,22 @@ tags: 
	support-files/build-tags

.PHONY:		init-db bin-dist



# Test installation

# Test installation. Ports are configurable from the environment.



MYSQL_TEST_MANAGER_PORT =	9305

MYSQL_TEST_MASTER_PORT =	9306

MYSQL_TEST_SLAVE_PORT =		9308

MYSQL_TEST_NDB_PORT =		9350



test:

	cd mysql-test; perl mysql-test-run.pl && perl mysql-test-run.pl --ps-protocol
 
	cd mysql-test ; \

	./mysql-test-run.pl \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT) && \

	./mysql-test-run.pl --ps-protocol \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)

mysql-test/r/ctype_utf8.result

+12 −0
Original line number Diff line number Diff line
@@ -993,6 +993,18 @@ select * from t1 where a like "%abc\d%"; 
a

abcd

drop table t1;

set names utf8;

create table t1 (a char(3), b varchar(10));

insert into t1 values ('bar','kostja');

prepare my_stmt from "select * from t1 where a=?";

set @a:='bar';

execute my_stmt using @a;

a	b

bar	kostja

set @a:=NULL;

execute my_stmt using @a;

a	b

drop table t1;

CREATE TABLE t1 (

a varchar(255) NOT NULL default '',

KEY a (a)

mysql-test/t/ctype_utf8.test

+14 −0
Original line number Diff line number Diff line
@@ -831,6 +831,20 @@ select * from t1 where a like "%abc\d%"; 
drop table t1;





#

# Bug #12371 executing prepared statement fails (illegal mix of collations)

#

set names utf8;

create table t1 (a char(3), b varchar(10));

insert into t1 values ('bar','kostja');

prepare my_stmt from "select * from t1 where a=?";

set @a:='bar';

execute my_stmt using @a;

set @a:=NULL;

execute my_stmt using @a;

drop table t1;





#

# Bug#9557 MyISAM utf8 table crash

#

ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp

+2 −2
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ NdbOut& operator<<(NdbOut& no, const CommitTransactionRecord& ctr) { 
  no << "----------COMMIT TRANSACTION RECORD------------" << endl << endl;

  printOut("Record type:", ctr.m_recordType);

  printOut("TableId", ctr.m_tableId);

  printOut("SchemaVersion:", ctr.m_schemaVersion);

  printOut("FfragmentId", ctr.m_fragmentId);

  printOut("File no. of Prep. Op.", ctr.m_fileNumberOfPrepareOperation);

  printOut("Start page no. of Prep. Op.", ctr.m_startPageNumberOfPrepareOperation);
@@ -127,7 +128,7 @@ bool PrepareOperationRecord::check() { 
  if (m_operationType == 3 && m_attributeLength != 0)

    return false;



  if (m_logRecordSize != (m_attributeLength + m_keyLength + 7))

  if (m_logRecordSize != (m_attributeLength + m_keyLength + 6))

    return false;



  return true;
@@ -142,7 +143,6 @@ NdbOut& operator<<(NdbOut& no, const PrepareOperationRecord& por) { 
  printOut("Record type:", por.m_recordType);

  printOut("logRecordSize:", por.m_logRecordSize);

  printOut("hashValue:", por.m_hashValue);

  printOut("schemaVersion:", por.m_schemaVersion);

  switch (por.m_operationType) {

  case 0:

    ndbout_c("%-30s%-12u%-6s", "operationType:",

ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define NO_PAGES_IN_MBYTE 32

#define NO_MBYTE_IN_FILE 16



#define COMMITTRANSACTIONRECORDSIZE 8

#define COMMITTRANSACTIONRECORDSIZE 9

#define COMPLETEDGCIRECORDSIZE 2

#define PAGEHEADERSIZE 32

#define FILEDESCRIPTORHEADERSIZE 3
@@ -89,7 +89,6 @@ protected: 
  Uint32 m_recordType;

  Uint32 m_logRecordSize;

  Uint32 m_hashValue;

  Uint32 m_schemaVersion;

  Uint32 m_operationType; // 0 READ, 1 UPDATE, 2 INSERT, 3 DELETE

  Uint32 m_attributeLength;

  Uint32 m_keyLength;
@@ -190,6 +189,7 @@ public: 
protected:

  Uint32 m_recordType;

  Uint32 m_tableId;

  Uint32 m_schemaVersion;

  Uint32 m_fragmentId;

  Uint32 m_fileNumberOfPrepareOperation;

  Uint32 m_startPageNumberOfPrepareOperation;