BitKeeper/etc/ignore:
Added libmysqld/sp_cache.cc to the ignore list
mysql-test/r/query_cache.result:
test of query with leding comment
mysql-test/t/query_cache.test:
test of query with leding comment
myisam/mi_check.c:
Fixed memory overrun in _mi_put_key_in_record
myisam/mi_key.c:
Fixed unnecessary memory allocation
mysql-test/r/insert_select.result:
Added test case for memory corruption
mysql-test/t/insert_select.test:
Added test case for memory corruption
mysys/safemalloc.c:
Removed compiler warnings
sql/sql_acl.cc:
Fixed core dump when running with --debug
mysql-test/r/subselect.result:
results of new optimisation
mysql-test/t/subselect.test:
results of new optimisation
sql/item_cmpfunc.h:
function type
sql/item_func.h:
function type
sql/item_subselect.cc:
new optimisation for ref_or_null
sql/item_subselect.h:
new optimisation for ref_or_null
sql/sql_select.cc:
new optimisation for ref_or_null
sql/sql_select.h:
item_subselect.cc need safe_index_read
into oak.local:/home/kostja/mysql/mysql-4.1
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/serbian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
as [skipped], even when run explicitly.)
mysql-test/include/have_openssl_2.inc:
There is no such variable as SSL_get_cipher.
mysql-test/r/have_openssl_2.require:
Require file required garbage. Fix to require something sensible.
mysql-test/r/openssl_2.result:
Add output of SHOW STATUS to test result.
mysql-test/t/openssl_2.test:
Use actual lettercase of SSL status variables.
(Test will work with uppercase, but there's no
reason not to use the actual lettercase.)
include/my_sys.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/mysqld.cc:
Manual merge
mysql-test/r/merge.result:
Sync to modified error message.
sql/share/danish/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/dutch/errmsg.txt:
Remove extraneous periods.
sql/share/english/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/estonian/errmsg.txt:
Remove extraneous periods.
sql/share/french/errmsg.txt:
Remove extraneous periods.
sql/share/german/errmsg.txt:
Remove extraneous periods.
sql/share/greek/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/hungarian/errmsg.txt:
Remove extraneous periods.
sql/share/italian/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/japanese/errmsg.txt:
Remove extraneous periods.
sql/share/korean/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/norwegian-ny/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/norwegian/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/polish/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/romanian/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/russian/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/serbian/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/slovak/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/spanish/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
sql/share/swedish/errmsg.txt:
Ellipses are three dots, not four or five.
Remove other extraneous periods.
Fixed test for binary build
mysql-test/r/rpl_max_relay_size.result:
Fixed test for binary build
mysql-test/t/rpl_max_relay_size.test:
Fixed test for binary build
sql/log.cc:
Fixed wrong test in close
mysql-test/t/rpl_flush_log_loop.test:
Add timer to avoid problem when 'flush logs' is executed before we have read all data from master
sql/log.cc:
Better fix for bug #791:
Mark log as LOG_TO_BE_OPENED instead of LOG_CLOSED when it's closed and opened.
sql/mysqld.cc:
Better startup message
sql/slave.cc:
Fix argument to close()
sql/sql_class.h:
Better handling of log.close()
Changed is_open() to work as before.
Added back inited argument to LOG
mysql-test/r/rpl_flush_log_loop.result:
Fixed results (probably bug in previous rpatch)
sql/handler.cc:
Changed is_open() to work as before
sql/item_func.cc:
Changed is_open() to work as before
sql/log.cc:
Part revert of previous patch.
The reason for adding back 'inited' is that is that we can't be 100 % sure that init_pthread_objects() is called before mysqld dies (for example on windows)
I removed mutex lock handling in is_open() as the new code didn't have ANY affect except beeing slower.
Added back checking of is_open() to some functions as we don't want to do a mutex lock when we are not using logging.
Indentation/comment fixes
sql/log_event.cc:
Changed is_open() to work as before
sql/repl_failsafe.cc:
Changed is_open() to work as before
sql/sql_base.cc:
Changed is_open() to work as before
sql/sql_class.h:
Changed is_open() to work as before. Added back 'inited' variable
sql/sql_db.cc:
Changed is_open() to work as before
sql/sql_delete.cc:
Changed is_open() to work as before
sql/sql_insert.cc:
Changed is_open() to work as before
sql/sql_load.cc:
Changed is_open() to work as before
sql/sql_parse.cc:
Changed is_open() to work as before
sql/sql_rename.cc:
Changed is_open() to work as before
sql/sql_repl.cc:
Changed is_open() to work as before
sql/sql_table.cc:
Changed is_open() to work as before
sql/sql_update.cc:
Changed is_open() to work as before
into sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
Removed PURGE LOGS (now PURGE MASTER LOGS).
Added SHOW BDB LOGS as synonym for SHOW LOGS.
Note: tests key_cache.test hanged, rpl_log_pos.test, rpl_rotate_logs.test failed for me.
For the second and third one I guess this will disappear after merging 4.0.
mysql-test/r/rpl_rotate_logs.result:
result update
mysql-test/t/rpl_rotate_logs.test:
added test for synonym PURGE BINARY LOGS, changed PURGE LOGS to
PURGE MASTER LOGS.
sql/sql_yacc.yy:
Added SHOW MASTER LOGS as synonym for SHOW BINARY LOGS.
Added PURGE BINARY LOGS as synonym for PURGE MASTER LOGS.
Removed PURGE LOGS (now PURGE MASTER LOGS).
Added SHOW BDB LOGS as synonym for SHOW LOGS.
port number can be different from 3306 when doing the release builds
with Do-compile, therefore it has to be replaced with the correct
value during the test run using the "--replace_result" function.
mysql-test/r/rpl_error_ignored_table.result:
- replaced hard-coded master port number with MASTER_PORT variable, since
the port number is different when running the test suite during the
release builds with "Do-compile".
mysql-test/t/rpl_error_ignored_table.test:
- replaced hard-coded master port number with MASTER_PORT variable, since
the port number is different when running the test suite during the
release builds with "Do-compile".
"mysqlhotcopy fails to copy tables but does not indicate a failure"
("does not indicate a failure");
this is about "mysqlhotcopy fails to copy tables".
mysql-test/t/rpl_error_ignored_table-slave.opt:
added a missing newline
scripts/mysqlhotcopy.sh:
Fix for BUG#812.
The problem was that with many tables to copy (10000 in the bug's example),
the generated 'cp' command line was 1MB long, whereas (at least on my Linux) it
should not exceed 128 kB. Testing the 'cp' in a shell terminal gives
"arguments list too long".
So we issue several small (100 kB) 'cp' command lines instead of a big one.
Of course, this will still fail on systems where the limit is below 100 kB.
We now have safe_system() which cuts the command line in pieces,
and calls safe_simple_system() (execution) for each piece.
5.0 and 4.1 (where it fails).
mysql-test/r/subselect.result:
It turns out that it's correct that this test doesn't give an error in 5.0.
mysql-test/t/subselect.test:
It turns out that it's correct that this test doesn't give an error in 5.0.
the server error messages had been modified in errmsg.txt
mysql-test/r/create.result:
- Updated error message in result after errmsg.txt has been modified
mysql-test/r/drop.result:
- Updated error message in result after errmsg.txt has been modified
mysql-test/r/rpl000009.result:
- Updated error message in result after errmsg.txt has been modified
mysql-test/r/symlink.result:
- Updated error message in result after errmsg.txt has been modified
mysql-test/r/warnings.result:
- Updated error message in result after errmsg.txt has been modified
