into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
libmysql/libmysql.c:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/type_float.test:
Auto merged
into mysql.com:/home/ram/work/b31154/b31154.5.1
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
into mysql.com:/home/ram/work/b30885/b30885.5.1
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/t/heap_btree.test:
Auto merged
storage/heap/hp_hash.c:
the code was changed to use bitmaps instead of key length, so ul
into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
BitKeeper/deleted/.del-changelog~8457b43736642c:
Auto merged
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
Auto merged
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
Auto merged
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
Auto merged
BitKeeper/deleted/.del-README.debian~223f0edd363d08af:
Auto merged
BitKeeper/deleted/.del-aa~f8c7e976fa99167f:
Auto merged
BitKeeper/deleted/.del-ab~1145a71fc2a5dbb8:
Auto merged
BitKeeper/deleted/.del-ac~66b41066a435209:
Auto merged
BitKeeper/deleted/.del-ad~9296238d4d7d5bb3:
Auto merged
BitKeeper/deleted/.del-ae~c54b032746985759:
Auto merged
BitKeeper/deleted/.del-az~45092291b7eff90a:
Auto merged
BitKeeper/deleted/.del-control~a2146883b4ed7c94:
Auto merged
BitKeeper/deleted/.del-gomi~bcec57fe6195deee:
Auto merged
BitKeeper/deleted/.del-libmysqlclient10.dirs~24c90ade3a371b6f:
Auto merged
BitKeeper/deleted/.del-libmysqlclient10.postinst~5829f4e4a7c0206b:
Auto merged
BitKeeper/deleted/.del-libmysqlclient9.dirs~4420713260a0eb40:
Auto merged
BitKeeper/deleted/.del-libmysqlclient9.postinst~80ad5f1e4633a219:
Auto merged
BitKeeper/deleted/.del-move~6b750ba06050bc92:
Auto merged
BitKeeper/deleted/.del-mysql-bench.dirs~3407d505223bf583:
Auto merged
BitKeeper/deleted/.del-mysql-client.dirs~3f347d1649db13e1:
Auto merged
BitKeeper/deleted/.del-mysql-dev.dirs~c6cacea9b3289f33:
Auto merged
BitKeeper/deleted/.del-mysql-doc.dirs~a468f79189ff27ad:
Auto merged
BitKeeper/deleted/.del-mysql-max-debug.dirs~58d766ce6caffa2b:
Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postinst~36f2faba601ed8a:
Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postrm~26bdf891820d3671:
Auto merged
BitKeeper/deleted/.del-mysql-max-shared.dirs~38f36e6773ac0e79:
Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postinst~3406aa3bae283fe0:
Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postrm~92193bedc2b75355:
Auto merged
BitKeeper/deleted/.del-mysql-max.dirs~be29c2b464db6050:
Auto merged
BitKeeper/deleted/.del-mysql-max.postinst~cc8a0b3de02b23e0:
Auto merged
BitKeeper/deleted/.del-mysql-max.postrm~66c355bd3081578b:
Auto merged
BitKeeper/deleted/.del-mysql-server-debug.dirs~7b6329c9df635ce4:
Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postinst~12af8ffb8a145fae:
Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postrm~ae113145ebc34ac8:
Auto merged
BitKeeper/deleted/.del-mysql-server-shared.dirs~cb56821f47811c7c:
Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postinst~c6fee24788b634a7:
Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postrm~f3d7f9c6bfb3ca9b:
Auto merged
BitKeeper/deleted/.del-mysql-server.conffiles~566a6664d16909f0:
Auto merged
BitKeeper/deleted/.del-mysql-server.dirs~b12380a091807c5e:
Auto merged
BitKeeper/deleted/.del-mysql-server.postinst~d72bf57a84001364:
Auto merged
BitKeeper/deleted/.del-mysql-server.postrm~68a988229b41c3bb:
Auto merged
BitKeeper/deleted/.del-mysql-server.prerm~4445eacc70e74899:
Auto merged
BitKeeper/deleted/.del-shlibs~3fe34471c220623c:
Auto merged
BitKeeper/deleted/.del-ta~ec794c5d9d922b6c:
Auto merged
BitKeeper/deleted/.del-tb~8844e8c985e40d4e:
Auto merged
If mysql_lock_tables fails because the lock was aborted, we need to
reset thd->some_tables_delete, otherwise we might loop indefinitely
because handler's tables are not closed in a standard way, meaning
that close_thread_tables() (which resets some_tables_deleted) is not
used.
This patch fixes sporadical failures of handler_myisam/innodb tests
which were introduced by previous fix for this bug.
sql/sql_handler.cc:
Properly reset thd->some_tables_deleted if mysql_lock_tables
fails for some reason.
(compiler issue ?)
Problem:
Improper compile-time flags on AIX prevented use of files > 2 GB. This
resulted in Max_data_length being truncated to 2 GB by MyISAM code.
Solution:
Reverted large-file changes from the fix for bug10776. We need to define
_LARGE_FILES on AIX to have support for files > 2 GB.
Since _LARGE_FILE_API is incompatible with _LARGE_FILES and may be
automatically defined by including standards.h, we also need a
workaround to avoid this conflict.
config/ac-macros/large_file.m4:
Reverted large-file changes from the fix for bug10776. We need to define
_LARGE_FILES on AIX to have support for files > 2 GB.
include/my_global.h:
_LARGE_FILE_API is defined in standards.h that is automatically included
by at least some C++ compilers on AIX. Since it is also incompatible
with _LARGE_FILES which is required for POSIX IO calls to be
largefile-safe, the only workaround is to explicitely #undef
_LARGE_FILE_API.
into sin.intern.azundris.com:/home/tnurnberg/30951/51-30951
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
sql-common/my_time.c:
Auto merged
makedate() will fold years below 100 into the 1970-2069 range. CS removes code
that also wrongly folded years between 100 and 200 into that range, which should
be left unchanged. Backport from 5.1.
mysql-test/r/func_sapdb.result:
Show that makedate() works correctly for 100 <= year < 200.
mysql-test/t/func_sapdb.test:
Show that makedate() works correctly for 100 <= year < 200.
sql-common/my_time.c:
Remove unnecessary date magic. Syncs behaviour with 5.1+
and manual.
Options to mysqld were not processed correctly because switch statement
was missing some "break"s. CS adds them.
No test case; would require .opt file and server restart. Manually tested.
sql/mysqld.cc:
Add missing "break"s to switch() in mysqld to fix option processing.
into solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
BitKeeper/deleted/.del-changelog:
Auto merged
BitKeeper/deleted/.del-libmysqlclientSLIB-dev.files.in:
Auto merged
BitKeeper/deleted/.del-mysql-client-BASE.files.in:
Auto merged
BitKeeper/deleted/.del-mysql-server-BASE.files.in:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-mysql-test-BASE.files.in:
Auto merged
BitKeeper/deleted/.del-rules:
Auto merged
Makefile.am:
Merged in removal of debian dir from 5.0-maint
Before this patch, failures to write to the log tables (mysql.slow_log
and mysql.general_log) were improperly printed (the time was printed twice),
or not printed at all.
With this patch, failures to write to the log tables is reported in the
error log, for all cases of failures.
mysql-test/r/log_tables.result:
Bug#27858 (Failing to log to a log table doesn't log anything to error log)
mysql-test/t/log_tables.test:
Bug#27858 (Failing to log to a log table doesn't log anything to error log)
sql/log.cc:
Bug#27858 (Failing to log to a log table doesn't log anything to error log)
"DECLARE CURSOR FOR SHOW ..." is a syntax that currently appears to work,
but is untested for some SHOW commands and does not work for other SHOW
commands.
Since this is an un-intended feature that leaked as a result of a coding bug
(in the parser grammar), the correct fix is to fix the grammar to not accept
this construct.
In other words, "DECLARE CURSOR FOR SHOW <other commands that don't work>"
is not considered a bug, and we will not implement other features to make all
the SHOW commands usable inside a cursor just because someone exploited a bug.
mysql-test/r/sp-error.result:
Only allow declaring cursors for SELECT statements to avoid
possible further confusion/problems.
mysql-test/t/information_schema.test:
Only SELECT statements are allowed in cursors.
mysql-test/t/sp-error.test:
Add test case for Bug#29223. Non-SELECT statements in cursors now
yields a parser error.
sql/sql_yacc.yy:
Rework DECLARE CURSOR statement to not allow non-SELECT statements.
mysql_change_user().
The problem was that THD::ull was not reset in THD::cleanup().
The fix is to reset it.
sql/sql_class.cc:
Reset THD::ull after cleanup to prevent memory corruption.
tests/mysql_client_test.c:
Add test case for BUG#31418.
Problem: GROUP_CONCAT(DISTINCT BIT_FIELD...) uses a tree to store keys;
which are constructed using a temporary table fields,
see Item_func_group_concat::setup().
As a) we don't store null bits in the tree where the bit fields store parts
of their data and b) there's no method to properly compare two table records
we've got problem.
Fix: convert BIT fields to INT in the temporary table used.
mysql-test/r/func_gconcat.result:
Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
- test result.
mysql-test/t/func_gconcat.test:
Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
- test case.
sql/item_sum.cc:
Fix for bug #31154: field.h:1649: virtual int Field_bit::cmp(const uchar*, const uchar*): Assertion
- force the create_tmp_table() to convert BIT columns to INT
in order to be able to compare records containing BIT fields.
myisam_sort_buffer_size.
An incorrect length of the sort buffer was used when calculating the
maximum number of keys. When myisam_sort_buffer_size is small enough,
this could result in the number of keys < number of
BUFFPEK structures which in turn led to use of uninitialized BUFFPEKs.
Fixed by correcting the buffer length calculation.
myisam/sort.c:
Use a correct buffer length when calculating the maximum number of keys.
Assert that for each BUFFPEK structure there is at least one
corresponding key. Otherwise we would fail earlier and not reach
merge_buffers().
mysql-test/r/repair.result:
Added a test case for bug #31174.
mysql-test/t/repair.test:
Added a test case for bug #31174.
mysql-test/include/handler.inc:
Add test case for Bug 31409
mysql-test/r/handler_innodb.result:
Add test case result for InnoDB run of the handler test for Bug 31409
mysql-test/r/handler_myisam.result:
Add test case result for MyISAM run of the handler test for Bug 31409
static but it's still used by another compilation unit.
Remove static qualifier from do_command definition.
sql/sql_parse.cc:
do_command is also used by sql_connect.c in 5.1
into moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/sql_parse.cc:
Auto merged
