mysql-test/r/flush_block_commit.result:
FLUSH TABLES WITH READ LOCK should block writes to binlog too
it does not yet
mysql-test/t/flush_block_commit.test:
FLUSH TABLES WITH READ LOCK should block writes to binlog too
it does not yet
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).
sql/share/Makefile.am:
using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
all-local is the standard way to add something to all: (thanks Konstantin)
configure.in:
Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( )
if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).
sql/sql_table.cc:
When optimizing a table, if we fall back to mysql_alter_table()
(for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).
into mdk10.(none):/home/reggie/bk/mysql-5.0
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/item_create.cc:
Auto merged
sql/mysqld.cc:
Auto merged
server-tools/instance-manager/options.cc:
remove [mysql] group from the list of the groups read by the mysqlmanager (resulted from wrong merge long ago)
ndb/include/ndbapi/NdbScanOperation.hpp:
release scan op early to save memory
ndb/src/ndbapi/NdbScanOperation.cpp:
release scan op early to save memory
ndb/src/ndbapi/NdbTransaction.cpp:
release scan op early to save memory
ndb/src/ndbapi/Ndblist.cpp:
release scan op early to save memory
sql/ha_ndbcluster.cc:
release scan op early to save memory
mysql-test/r/ctype_collate.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/sql_table.cc:
Auto merged
config/ac-macros/character_sets.m4:
In 4.1, this was in "configure.in" with this comment:
Normally, 'configure' does only support "case-insensitive" collations for UTF-8 character sets.
However, a certain customer requires builds with a "case-sensitive" collation: 'utf8_general_cs'.
In order to do custom builds without manual patches, this value gets special handling in 'configure'.
Also, when it is given, the CPP symbol enabling the additional code is set.
configure.in:
No change here - functionality was moved to 'config/ac-macros/character_sets.m4'
mysys/charset-def.c:
Auto-merged.
strings/ctype-utf8.c:
Auto-merged.
into mysql.com:/home/jonas/src/mysql-5.0
mysql-test/mysql-test-run.sh:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_select.cc:
Auto merged
into mysql.com:/home/dlenev/src/mysql-4.1-merges
sql/item_create.cc:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
function".
We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
mysql-test/r/query_cache.result:
Let us test that queries with CURRENT_USER() function are not cached.
mysql-test/t/query_cache.test:
Let us test that queries with CURRENT_USER() function are not cached.
sql/item_create.cc:
create_func_current_user():
We should not cache queries which use CURRENT_USER() function.
fixing tests accordingly
item.cc:
Allow mixing non-binary collation and binary collation
even if coercibility is the same.
For easier 4.0 -> 4.1 migrating.
sql/item.cc:
Allow mixing non-binary collation and binary collation
even if coercibility is the same.
For easier 4.0 -> 4.1 migrating.
mysql-test/t/union.test:
fixing tests accordingly
mysql-test/r/union.result:
fixing tests accordingly
mysql-test/t/ctype_collate.test:
fixing tests accordingly
mysql-test/r/ctype_collate.result:
fixing tests accordingly
Added email threading capabilities to both
programs.
tests/mail_to_db.pl:
Changes to mail_to_db.pl
- Removed table name as optional. Future releases may require
more than one table, after which it's better to have a fixed
table name.
- Fixed a bug in report (division by zero error), if table was created,
but no mails was inserted.
- Added fields message_id and in_reply_to.
tests/pmail.pl:
Changed pmail:
New option: --thread. Prints all sub sequent replies in the thread.
New option: --message_id. Prints message_id and number of replies found.
Both options are run recursively. That means, not just direct replies to
the mail found are being searched, but also replies to replies and so on
until the whole thread has been found.
Clean up: Localized variables and moved code into functions.
mysql-test/r/sp-error.result:
Added test case for BUG#9073.
mysql-test/t/sp-error.test:
Added test case for BUG#9073.
sql/share/errmsg.txt:
New error message for duplicate condition handlers in stored procedures.
sql/sp_pcontext.cc:
Keep track on condition handlers in the same block for error checking.
sql/sp_pcontext.h:
Keep track on condition handlers in the same block for error checking.
sql/sql_yacc.yy:
Keep track on condition handlers in the same block for error checking.
and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied
mysql-test/r/sp.result:
New test cases for BUG#6900 and BUG#9074 (duplicates).
mysql-test/t/sp.test:
New test cases for BUG#6900 and BUG#9074 (duplicates).
sql/sp_rcontext.cc:
Corrected logic for finding condition handlers - pick the innermost one.
Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server
sql/mysqld.cc:
removed the code that set the shared memory connect event since this also being done in kill_server
