Portability fixes

client/Makefile.am:
  Cleanup
sql/Makefile.am:
  Cleanup
sql/share/dutch/errmsg.txt:
  Added missing error messages
sql/share/ukrainian/errmsg.txt:
  Added missing error messages
sql/sql_handler.cc:
  Portability fix
tools/Makefile.am:
  Portability fix

6 files changed, 23 insertions, 17 deletions

diff --git a/client/Makefile.am b/client/Makefile.am
index e39c663de15..d5b80ac5f4c 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -36,14 +36,14 @@ mysqldump_DEPENDENCIES=		$(LIBRARIES) $(pkglib_LTLIBRARIES)
 mysqlimport_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
 insert_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
 select_test_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
-mysqltest_SOURCES=			mysqltest.c
+mysqltest_SOURCES=		mysqltest.c
 mysqltest_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES)
-mysqlbinlog_SOURCES =   mysqlbinlog.cc 
+mysqlbinlog_SOURCES =		mysqlbinlog.cc 
 mysqlbinlog_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES)
-sql_src=log_event.h log_event.cc
+sql_src=			log_event.h log_event.cc
 
 # Fix for mit-threads
-DEFS =			-DUNDEF_THREADS_HACK
+DEFS=				-DUNDEF_THREADS_HACK
 
 link_sources:
 	for f in $(sql_src) ; do \
diff --git a/sql/Makefile.am b/sql/Makefile.am
index 3456a07977d..abde8b3a738 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -24,7 +24,7 @@ INCLUDES =		@MT_INCLUDES@ \
 			@bdb_includes@ @innodb_includes@ @gemini_includes@ \
 			-I$(srcdir)/../include \
 			-I$(srcdir)/../regex \
-			-I$(srcdir) -I../include -I.. -I. $(openssl_includes)
+			-I$(srcdir) -I../include $(openssl_includes)
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 245ff40cf86..ea8984ae1ce 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -167,6 +167,8 @@
 "Communicatiepakket kon niet worden gedecomprimeerd",
 "Fout bij het lezen van communicatiepakketten"
 "Timeout bij het lezen van communicatiepakketten",
+"Got an error writing communication packets",
+"Got timeout writing communication packets",
 "Resultaat string is langer dan max_allowed_packet",
 "Het gebruikte tabel type ondersteunt geen BLOB/TEXT kolommen",
 "Het gebruikte tabel type ondersteunt geen AUTO_INCREMENT kolommen",
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index db17f88f2c2..4ed29035514 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -219,3 +219,10 @@
 "Хибний аргумент для %s",
 "Користувачу %-.32s@%-.64s не дозволено створювати нових користувач╕в",
 "Incorrect table definition; All MERGE tables must be in the same database",
+"Error connecting to master: %-.128s",
+"Error running query on master: %-.128s",
+"Error when executing command %s: %-.128s",
+"Wrong usage of %s and %s",
+"The used SELECT statements have a different number of columns",
+"Can't execute the query because you have a conflicting read lock",
+"Mixing of transactional and non-transactional tables is disabled",
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 98cc523dc9b..668c5f07839 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -159,7 +159,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
             item->save_in_field(key_part->field);
             key_len+=key_part->store_length;
           }
-          if (!(key=sql_calloc(ALIGN_SIZE(key_len))))
+          if (!(key= (byte*) sql_calloc(ALIGN_SIZE(key_len))))
           {
             send_error(&thd->net,ER_OUTOFMEMORY);
             goto err; 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index aa513c13f05..9f57d4c81df 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,14 +1,11 @@
-INCLUDES =			-I$(srcdir)/../include $(openssl_includes) \
-				-I../include -I$(srcdir)/.. -I$(top_srcdir) \
-				-I..
-LIBS =				@TOOLS_LIBS@ $(openssl_libs)
-LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la
-bin_PROGRAMS =			mysqlmanager
-mysqlmanager_SOURCES = mysqlmanager.c 
-mysqlmanager_DEPENDENCIES=   	$(LIBRARIES) $(pkglib_LTLIBRARIES)
-DEFS =			-DUNDEF_THREADS_HACK
+INCLUDES =		@MT_INCLUDE@ -I$(srcdir)/../include \
+			$(openssl_includes) -I../include
+LIBS=			@openssl_libs@
+LDADD=			@CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la
+bin_PROGRAMS=		mysqlmanager
+mysqlmanager_SOURCES=	mysqlmanager.c
+mysqlmanager_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
+DEF=			-DUNDEF_THREADS_HACK
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
-
-