sql/ha_ndbcluster.cc:
Make 'ndbcluster_end' wait for thread created by 'ndbluster_init'
sql/ha_ndbcluster_binlog.cc:
Make 'ndbcluster_binlog_end' wait for thread created by 'ndbcluster_binlog_start'
into chilla.local:/home/mydev/mysql-5.1-axmrg
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_range.c:
Auto merged
storage/myisam/mi_test1.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/rt_split.c:
Auto merged
fixing pushbuild warnings and errors
sql/sql_servers.cc:
WL# 3031
Cleaning up compile warnings on various platforms that I found with pushbuild
storage/federated/ha_federated.cc:
WL# 3031
Cleaning up compile warnings on various platforms that I found with pushbuild,
error on windows
into trift2.:/MySQL/M51/push-5.1
mysql-test/mysql-test-run.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
Auto merged
another handler from 'plugin_foreach'
sql/sql_plugin.cc:
Remove plugin from plugin_array after it has been initialized to
avoid it being referenced. For example if a plugin deletes a THD object
that will call 'ha_close_connection' wich will iterate over all storage
engine plugins
into chilla.local:/home/mydev/mysql-5.0-axmrg
myisam/mi_packrec.c:
Auto merged
myisam/mi_range.c:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/rt_split.c:
Auto merged
myisam/mi_write.c:
Manual merge from 4.1.
Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls,
due to non-used parameters (in non-debug mode), and
due to seemingly uninitialized variables.
Initialized variables, declared parameters unused, and
casted DBUG_PRINT arguments to get rid of warnings.
myisam/mi_range.c:
Bug#25213 - Compiler warnings in MyISAM code
Initialized a variable to get rid of a compiler warning.
myisam/mi_test1.c:
Bug#25213 - Compiler warnings in MyISAM code
Declared an parameter unused to get rid of warnings.
myisam/mi_write.c:
Bug#25213 - Compiler warnings in MyISAM code
Initialized a variable to get rid of a compiler warning.
Casted arguments to DBUG_PRINT to match them with their
format string conversion specification.
myisam/rt_split.c:
Bug#25213 - Compiler warnings in MyISAM code
Initialized variables to get rid of compiler warnings.
Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls.
Fixed DBUG_PRINT format specifiactions.
myisam/mi_packrec.c:
Bug#25208 - Warnings in mi_packrec.c
Fixed DBUG_PRINT format specifiactions.
cmd-line-utils/readline/histfile.c:
Remove warning (compare signed & unsigned)
sql/udf_example.c:
Remove warning (cast integer to pointer of different size)
strings/decimal.c:
Remove warning (%lx format, double arg)
more similar to my_strtod() (and maybe even a bit faster due
to less floating point divisions).
This should at least partially fix Bug #23260 for DECIMALs
with a moderate number of total digits.
InnoDB timeout behavior (Bug #24200)
mysql-test/t/innodb_mysql-master.opt:
Set --innodb-lock-wait-timeout=2, since test for bug #24200 times out.
This *could* cause random test failures if some long-running transaction concurrency is being tested. However, such a test really should go in innodb-big or some other test file.
Handling of large signed/unsigned values was not consistent, so some string functions could return bogus results.
The current fix is to simply patch up the val_str() methods for those string items.
It would be good clean this code up in general, to make similar problems much harder to make. This is left as an exercise for the reader.
mysql-test/r/func_str.result:
Update test results for bug #24947
mysql-test/t/func_str.test:
Add test case for bug #24947
sql/item_strfunc.cc:
Adjust some string function Items' val_str() methods to handle large signed/unsigned arguments properly
into chilla.local:/home/mydev/mysql-5.1-axmrg
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/sql_class.h:
Auto merged
configure.in:
Manual merge from 5.0.
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
mysql-test/t/grant_cache.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/query_cache_notembedded.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl000015.test:
SCCS merged
mysql-test/t/rpl000017.test:
SCCS merged
The final testcase needing new error codes. Really.
mysql-test/r/rpl_row_tabledefs_2myisam.result:
WL #3031
Ack! Another test needing new error code results
