2821 Georgi Kodinov 2009-03-20
Fixed a prototype to match the actual function signature (addendum to the
fix for 29125).
modified:
mysys/hash.c
2820 Georgi Kodinov 2009-03-20
reverting a bogus fix into 5.1-bugteam
modified:
configure.in
include/Makefile.am
2819 Chad MILLER 2009-03-19 [merge]
Merge contributed automake changes, and 5.1 upstream.
modified:
client/mysql_upgrade.c
client/mysqladmin.cc
client/mysqlbinlog.cc
client/mysqlcheck.c
client/mysqldump.c
client/mysqlslap.c
client/mysqltest.cc
client/sql_string.cc
extra/comp_err.c
extra/yassl/src/buffer.cpp
extra/yassl/taocrypt/include/block.hpp
extra/yassl/taocrypt/src/algebra.cpp
extra/yassl/taocrypt/src/asn.cpp
include/config-win.h
libmysql/libmysql.c
mysql-test/r/index_merge_myisam.result
mysql-test/r/union.result
mysql-test/t/index_merge_myisam.test
mysql-test/t/union.test
mysys/array.c
mysys/base64.c
mysys/charset.c
mysys/checksum.c
mysys/default.c
mysys/default_modify.c
mysys/hash.c
mysys/mf_keycache.c
mysys/mf_tempdir.c
mysys/my_append.c
mysys/my_compress.c
mysys/my_conio.c
mysys/my_copy.c
mysys/my_getwd.c
mysys/my_pread.c
mysys/my_quick.c
mysys/my_read.c
mysys/safemalloc.c
mysys/string.c
server-tools/instance-manager/buffer.cc
server-tools/instance-manager/instance.cc
server-tools/instance-manager/options.cc
server-tools/instance-manager/parse.h
sql-common/client.c
sql-common/my_user.c
sql/event_data_objects.cc
sql/event_parse_data.cc
sql/events.cc
sql/gen_lex_hash.cc
sql/item.h
sql/item_func.cc
sql/item_strfunc.cc
sql/item_timefunc.cc
sql/lock.cc
sql/log_event.cc
sql/log_event.h
sql/log_event_old.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/net_serv.cc
sql/opt_range.cc
sql/set_var.cc
sql/set_var.h
sql/sp_head.h
sql/spatial.h
sql/sql_class.h
sql/sql_connect.cc
sql/sql_crypt.cc
sql/sql_error.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_prepare.cc
sql/sql_profile.cc
sql/sql_repl.cc
sql/sql_select.h
sql/sql_servers.cc
sql/sql_string.cc
sql/sql_table.cc
sql/sql_trigger.cc
sql/sql_udf.cc
sql/sql_view.cc
sql/strfunc.cc
sql/udf_example.c
sql/uniques.cc
storage/archive/azio.c
storage/archive/azlib.h
storage/csv/ha_tina.cc
storage/csv/ha_tina.h
storage/csv/transparent_file.h
storage/federated/ha_federated.cc
storage/federated/ha_federated.h
storage/heap/hp_write.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/include/pars0pars.h
storage/myisam/ha_myisam.cc
storage/myisam/mi_check.c
storage/myisam/mi_packrec.c
storage/myisam/mi_search.c
storage/myisam/rt_index.c
storage/myisammrg/ha_myisammrg.cc
strings/ctype.c
strings/my_vsnprintf.c
tests/bug25714.c
tests/mysql_client_test.c
=== modified file 'configure.in'
--- a/configure.in 2009-03-19 13:53:54 +0000
+++ b/configure.in 2009-03-20 11:18:29 +0000
@@ -1678,17 +1678,14 @@ if test "$with_debug" = "yes"
then
# Medium debug.
AC_DEFINE([DBUG_ON], [1], [Use libdbug])
- AC_DEFINE([SAFE_MUTEX], [1], [Use safe mutexes])
- CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $CFLAGS"
- CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $CXXFLAGS"
+ CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS"
+ CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
elif test "$with_debug" = "full"
then
# Full debug. Very slow in some cases
AC_DEFINE([DBUG_ON], [1], [Use libdbug])
- AC_DEFINE([SAFE_MUTEX], [1], [Use safe mutexes])
- AC_DEFINE([SAFEMALLOC], [1], [Use safe malloc])
- CFLAGS="$DEBUG_CFLAGS $CFLAGS"
- CXXFLAGS="$DEBUG_CXXFLAGS $CXXFLAGS"
+ CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
+ CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
else
# Optimized version. No debug
AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug])
@@ -2815,7 +2812,6 @@ AC_CONFIG_FILES(Makefile extra/Makefile
include/mysql_version.h plugin/Makefile win/Makefile)
AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
-AC_CONFIG_COMMANDS([my_config.h], cp include/config.h include/my_config.h)
# Ensure that table handlers gets all modifications to CFLAGS/CXXFLAGS
AC_CONFIG_COMMANDS_POST(ac_configure_args="$ac_configure_args CFLAGS='$CFLAGS' CXXFLAGS='$CXXFLAGS'")
=== modified file 'include/Makefile.am'
--- a/include/Makefile.am 2009-03-19 13:37:30 +0000
+++ b/include/Makefile.am 2009-03-20 11:18:29 +0000
@@ -15,8 +15,9 @@
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA
-BUILT_SOURCES = link_sources
-HEADERS_GEN_CONFIGURE = mysql_version.h my_config.h
+BUILT_SOURCES = $(HEADERS_GEN_MAKE) link_sources
+HEADERS_GEN_CONFIGURE = mysql_version.h
+HEADERS_GEN_MAKE = my_config.h
HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \
my_list.h my_alloc.h typelib.h mysql/plugin.h
pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
@@ -25,7 +26,8 @@ pkginclude_HEADERS = $(HEADERS_ABI) my_d
decimal.h errmsg.h my_global.h my_net.h \
my_getopt.h sslopt-longopts.h my_dir.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
- m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE)
+ m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \
+ $(HEADERS_GEN_MAKE)
noinst_HEADERS = config-win.h config-netware.h my_bit.h \
heap.h my_bitmap.h my_uctype.h \
=== modified file 'mysys/hash.c'
--- a/mysys/hash.c 2009-02-13 16:41:47 +0000
+++ b/mysys/hash.c 2009-03-20 11:35:00 +0000
@@ -33,7 +33,7 @@ typedef struct st_hash_info {
uchar *data; /* data for current entry */
} HASH_LINK;
-static uint my_hash_mask(uint hashnr, uint buffmax, uint maxlength);
+static uint my_hash_mask(size_t hashnr, size_t buffmax, size_t maxlength);
static void movelink(HASH_LINK *array,uint pos,uint next_link,uint newlink);
static int hashcmp(const HASH *hash, HASH_LINK *pos, const uchar *key,
size_t length);
Attachment: [text/bzr-bundle] bzr/joro@sun.com-20090320113500-5tcofrf1bvc3jp84.bundle
| Thread |
|---|
| • bzr push into mysql-5.1-bugteam branch (joro:2819 to 2821) | Georgi Kodinov | 20 Mar |
