Commit 28d27983 authored by Tatiana A. Nurnberg's avatar Tatiana A. Nurnberg
Browse files

merge

parents 6d2f2873 d6700c7e

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.64)

AM_INIT_AUTOMAKE(mysql, 5.0.66)

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=64

NDB_VERSION_BUILD=66

NDB_VERSION_STATUS=""



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

mysql-test/r/federated_disabled.result

0 → 100644
+0 −0

Empty file added.

mysql-test/t/federated_disabled-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--skip-federated

mysql-test/t/federated_disabled.test

0 → 100644
+3 −0
Original line number Diff line number Diff line 
source include/federated.inc;



SHOW VARIABLES LIKE 'have_federated_engine';

mysys/errors.c

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void init_glob_errs() 
  EE(EE_STAT)		= "Can't get stat of '%s' (Errcode: %d)";

  EE(EE_CANT_CHSIZE)	= "Can't change size of file (Errcode: %d)";

  EE(EE_CANT_OPEN_STREAM)= "Can't open stream from handle (Errcode: %d)";

  EE(EE_GETWD)		= "Can't get working dirctory (Errcode: %d)";

  EE(EE_GETWD)		= "Can't get working directory (Errcode: %d)";

  EE(EE_SETWD)		= "Can't change dir to '%s' (Errcode: %d)";

  EE(EE_LINK_WARNING)	= "Warning: '%s' had %d links";

  EE(EE_OPEN_WARNING)	= "%d files and %d streams is left open\n";