Commit 13fd01aa authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Portability fixes

parent 560631ed

sql/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -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

sql/share/dutch/errmsg.txt

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

sql/share/ukrainian/errmsg.txt

+7 −0
Original line number Diff line number Diff line
@@ -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",

sql/sql_handler.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;

tools/Makefile.am

+8 −11
Original line number Diff line number Diff line 
INCLUDES =			-I$(srcdir)/../include $(openssl_includes) \

				-I../include -I$(srcdir)/.. -I$(top_srcdir) \

				-I..

LIBS =				@TOOLS_LIBS@ $(openssl_libs)

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)

DEFS =			-DUNDEF_THREADS_HACK

DEF=			-DUNDEF_THREADS_HACK



# Don't update the files from bitkeeper

%::SCCS/s.%

client/Makefile.am

+4 −4

File changed.

Contains only whitespace changes.