Commit 00855669 authored by joerg@trift-lap.fambruehe's avatar joerg@trift-lap.fambruehe
Browse files

Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0 

into  trift-lap.fambruehe:/MySQL/M50/work-5.0
parents 914e85b3 80b16212

client/mysqltest.c

+1 −0
Original line number Diff line number Diff line
@@ -5464,6 +5464,7 @@ void init_win_path_patterns() 
  const char* paths[] = { "$MYSQL_TEST_DIR",

                          "$MYSQL_TMP_DIR",

                          "$MYSQLTEST_VARDIR",

                          "$MASTER_MYSOCK",

                          "./test/" };

  int num_paths= sizeof(paths)/sizeof(char*);

  int i;

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,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, 5.0.62)

AM_INIT_AUTOMAKE(mysql, 5.0.64)

AM_CONFIG_HEADER([include/config.h:config.h.in])



PROTOCOL_VERSION=10
@@ -23,7 +23,7 @@ NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=62

NDB_VERSION_BUILD=64

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

include/my_global.h

+6 −2
Original line number Diff line number Diff line
@@ -533,8 +533,12 @@ C_MODE_END 
#undef DBUG_OFF

#endif



#if defined(_lint) && !defined(DBUG_OFF)

/* We might be forced to turn debug off, if not turned off already */

#if (defined(FORCE_DBUG_OFF) || defined(_lint)) && !defined(DBUG_OFF)

#  define DBUG_OFF

#  ifdef DBUG_ON

#    undef DBUG_ON

#  endif

#endif



#include <my_dbug.h>

mysql-test/r/bdb.result

+0 −1
Original line number Diff line number Diff line
@@ -1325,7 +1325,6 @@ set @a=repeat(' ',20); 
insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));

Warnings:

Note	1265	Data truncated for column 'v' at row 1

Note	1265	Data truncated for column 'c' at row 1

select concat('*',v,'*',c,'*',t,'*') from t1;

concat('*',v,'*',c,'*',t,'*')

*+ *+*+ *

mysql-test/r/binlog_innodb.result

+1 −1
Original line number Diff line number Diff line
@@ -34,6 +34,6 @@ END| 
INSERT INTO t2 VALUES (2),(10+bug23333());

SHOW MASTER STATUS;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

#	184136		

#	184141		

DROP FUNCTION bug23333;

DROP TABLE t1, t2;