Commit dfd38e1d authored by unknown's avatar unknown
Browse files

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

into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
parents 73165eca ae6f147a

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 4.1.8)

AM_INIT_AUTOMAKE(mysql, 4.1.9)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

include/raid.h

+4 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ C_MODE_END 
#endif

#if defined(USE_RAID)



#ifdef __GNUC__

#pragma interface			/* gcc class implementation */

#endif

#include "my_dir.h"



/* Trap all occurences of my_...() in source and use our wrapper around this function */
@@ -92,6 +89,10 @@ extern "C" { 
#ifdef __cplusplus

}



#ifdef __GNUC__

#pragma interface			/* gcc class implementation */

#endif



class RaidName {

  public:

    RaidName(const char *FileName);

mysql-test/r/update.result

+6 −0
Original line number Diff line number Diff line
@@ -206,3 +206,9 @@ colC colA colD colE colF 
3	4433	10005	492	500

DROP TABLE t1;

DROP TABLE t2;

create table t1 (c1 int, c2 char(6), c3 int);

create table t2 (c1 int, c2 char(6));

insert into t1 values (1, "t1c2-1", 10), (2, "t1c2-2", 20);

update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1";

update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1" where t1.c3 = 10;

drop table t1, t2;

mysql-test/t/update.test

+9 −0
Original line number Diff line number Diff line
@@ -161,3 +161,12 @@ SELECT * FROM t2; 
DROP TABLE t1;

DROP TABLE t2;



#

# Bug #6054 

#

create table t1 (c1 int, c2 char(6), c3 int);

create table t2 (c1 int, c2 char(6));

insert into t1 values (1, "t1c2-1", 10), (2, "t1c2-2", 20);

update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1";

update t1 left join t2 on t1.c1 = t2.c1 set t2.c2 = "t2c2-1" where t1.c3 = 10;

drop table t1, t2;

ndb/include/kernel/signaldata/CreateEvnt.hpp

+4 −4
Original line number Diff line number Diff line
@@ -475,14 +475,14 @@ struct CreateEvntRef { 
  }

};

inline bool CreateEvntRef::isTemporary() const

{ return (errorCode &  CreateEvntRef::Temporary) > 0; };

{ return (errorCode &  CreateEvntRef::Temporary) > 0; }

inline void CreateEvntRef::setTemporary()

{ errorCode |=  CreateEvntRef::Temporary; };

{ errorCode |=  CreateEvntRef::Temporary; }

inline CreateEvntRef::ErrorCode CreateEvntRef::setTemporary(ErrorCode ec)

{ return (CreateEvntRef::ErrorCode) 

    (errorCode = ((Uint32) ec | (Uint32)CreateEvntRef::Temporary)); };

    (errorCode = ((Uint32) ec | (Uint32)CreateEvntRef::Temporary)); }

inline CreateEvntRef::ErrorCode CreateEvntRef::makeTemporary(ErrorCode ec)

{ return (CreateEvntRef::ErrorCode) 

    ( (Uint32) ec | (Uint32)CreateEvntRef::Temporary ); };

    ( (Uint32) ec | (Uint32)CreateEvntRef::Temporary ); }



#endif