1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Portability fixes

Browse Source
This commit is contained in:
monty@hundin.mysql.fi 2001-09-17 00:32:45 +03:00
parent 560631ed3b
commit 13fd01aad3
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/Makefile.am
View File

@ -36,14 +36,14 @@ mysqldump_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
mysqlimport_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) mysqlimport_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
mysqltest_SOURCES= mysqltest.c mysqltest_SOURCES= mysqltest.c
mysqltest_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) mysqltest_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
mysqlbinlog_SOURCES = mysqlbinlog.cc mysqlbinlog_SOURCES = mysqlbinlog.cc
mysqlbinlog_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) 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 # Fix for mit-threads
DEFS = -DUNDEF_THREADS_HACK DEFS= -DUNDEF_THREADS_HACK
link_sources: link_sources:
for f in $(sql_src) ; do \ for f in $(sql_src) ; do \

2
sql/Makefile.am
View File

@ -24,7 +24,7 @@ INCLUDES = @MT_INCLUDES@ \
@bdb_includes@ @innodb_includes@ @gemini_includes@ \ @bdb_includes@ @innodb_includes@ @gemini_includes@ \
-I$(srcdir)/../include \ -I$(srcdir)/../include \
-I$(srcdir)/../regex \ -I$(srcdir)/../regex \
-I$(srcdir) -I../include -I.. -I. $(openssl_includes) -I$(srcdir) -I../include $(openssl_includes)
WRAPLIBS= @WRAPLIBS@ WRAPLIBS= @WRAPLIBS@
SUBDIRS = share SUBDIRS = share
libexec_PROGRAMS = mysqld libexec_PROGRAMS = mysqld

2
sql/share/dutch/errmsg.txt
View File

@ -167,6 +167,8 @@
"Communicatiepakket kon niet worden gedecomprimeerd", "Communicatiepakket kon niet worden gedecomprimeerd",
"Fout bij het lezen van communicatiepakketten" "Fout bij het lezen van communicatiepakketten"
"Timeout 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", "Resultaat string is langer dan max_allowed_packet",
"Het gebruikte tabel type ondersteunt geen BLOB/TEXT kolommen", "Het gebruikte tabel type ondersteunt geen BLOB/TEXT kolommen",
"Het gebruikte tabel type ondersteunt geen AUTO_INCREMENT kolommen", "Het gebruikte tabel type ondersteunt geen AUTO_INCREMENT kolommen",

7
sql/share/ukrainian/errmsg.txt
View File

@ -219,3 +219,10 @@
"èÉÂÎÉÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %s", "èÉÂÎÉÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %s",
"ëÏÒÉÓÔÕ×ÁÞÕ %-.32s@%-.64s ÎÅ ÄÏÚ×ÏÌÅÎÏ ÓÔ×ÏÒÀ×ÁÔÉ ÎÏ×ÉÈ ËÏÒÉÓÔÕ×ÁÞ¦×", "ëÏÒÉÓÔÕ×ÁÞÕ %-.32s@%-.64s ÎÅ ÄÏÚ×ÏÌÅÎÏ ÓÔ×ÏÒÀ×ÁÔÉ ÎÏ×ÉÈ ËÏÒÉÓÔÕ×ÁÞ¦×",
"Incorrect table definition; All MERGE tables must be in the same database", "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",

2
sql/sql_handler.cc
View File

@ -159,7 +159,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
item->save_in_field(key_part->field); item->save_in_field(key_part->field);
key_len+=key_part->store_length; 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); send_error(&thd->net,ER_OUTOFMEMORY);
goto err; goto err;

19
tools/Makefile.am
View File

@ -1,14 +1,11 @@
INCLUDES = -I$(srcdir)/../include $(openssl_includes) \ INCLUDES = @MT_INCLUDE@ -I$(srcdir)/../include \
-I../include -I$(srcdir)/.. -I$(top_srcdir) \ $(openssl_includes) -I../include
-I.. LIBS= @openssl_libs@
LIBS = @TOOLS_LIBS@ $(openssl_libs) LDADD= @CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysql_r/libmysqlclient_r.la bin_PROGRAMS= mysqlmanager
bin_PROGRAMS = mysqlmanager mysqlmanager_SOURCES= mysqlmanager.c
mysqlmanager_SOURCES = mysqlmanager.c mysqlmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES)
mysqlmanager_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) DEF= -DUNDEF_THREADS_HACK
DEFS = -DUNDEF_THREADS_HACK
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%