include/mysqld_error.h:
Added error codes for warnings and error messages for START SLAVE UNTIL
mysql-test/r/rpl000015.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_empty_master_crash.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_flush_log_loop.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_log.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_log_pos.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_redirect.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_replicate_do.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
mysql-test/r/rpl_rotate_logs.result:
Fixed test because 3 new columns to SHOW SLAVE STATUS output were added
sql/lex.h:
Added UNTIL symbol
sql/log.cc:
Invalidating until_log_name comparison result if group_relay_log_name is changed
sql/log_event.cc:
Invalidating until_log_name comparison result if group_master_log_name is changed
sql/repl_failsafe.cc:
Cancel until condition if LOAD MASTER DATA is executed
sql/share/czech/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/danish/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/dutch/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/english/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/estonian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/french/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/german/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/greek/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/hungarian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/italian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/japanese/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/korean/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/norwegian-ny/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/norwegian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/polish/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/portuguese/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/romanian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/russian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/serbian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/slovak/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/spanish/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/swedish/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/share/ukrainian/errmsg.txt:
Added error and warning message for START SLAVE UNTIL
sql/slave.cc:
Fixed wrong locking order in init_relay_log_pos()
Added until condition fields to SHOW SLAVE STATUS
Added checking if UNTIL condition is reached
(added proper method, added its invocation, reorganized locking
in exec_relay_log_event() and next_event())
sql/slave.h:
Members in RELAY_LOG_INFO for storing UNTIL condition. Also
methods for for invalidation of cached UNTIL condition comparison
results
sql/sql_repl.cc:
Now honoring UNTIL clause then starting slave thread. Proper
errors and warnings.
sql/sql_yacc.yy:
Added support for UNTIL clause in START SLAVE. This involved
extraction of some of master_defs to separate master_file_def
non-terminal.
mysql-test/r/fulltext2.result:
result updated
mysql-test/t/fulltext2.test:
test is now more silent
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
mysql-test/r/subselect.result:
merge
fixed test
mysql-test/t/subselect.test:
merge
fixed test
by MAX/MIN in some cases:
SELECT coercibility(max(s1)) from t1;
Subselect collation and derivation was not processed
correctly:
create table a select (select s1 from t1);
select * from t1 where s1 = (select s2 from t1);
(fixed BUG#943)
mysql-test/r/subselect.result:
test for bug 943
mysql-test/t/subselect.test:
test for bug 943
sql/item.cc:
bool field changed with enum
prevented finding references in item_list for non-SELECT st_select_lex
sql/sql_lex.cc:
bool field changed with enum
sql/sql_lex.h:
bool field changed with enum
sql/sql_parse.cc:
all subqueries and UNION parts marked as SELECT
sql/sql_yacc.yy:
bool field changed with enum
PRIMARY SELECT command st_select_lex marked as SELECT
removerd unused loop_id
mysql-test/r/subselect.result:
test of BUG#922
mysql-test/t/subselect.test:
test of BUG#922
sql/item.cc:
removerd unused loop_id
we need count HAVING clause elements, because agregate function can be present in it
sql/item.h:
removerd unused loop_id
sql/item_subselect.cc:
new name of field
sql/sql_derived.cc:
new name of field
sql/sql_lex.cc:
new name of field
sql/sql_lex.h:
new name of field
sql/sql_select.cc:
new name of field
sql/sql_union.cc:
new name of field
mysql-test/r/query_cache.result:
fixed charecter sets
new case sensetive test
mysql-test/t/query_cache.test:
fixed charecter sets
new case sensetive test
sql/sql_cache.cc:
query & table comparision should be case insensitive
The latter is misleading because differs from the syntax used for GRANT/REVOKE.
Fix up test result affected by error message edits.
mysql-test/r/grant_cache.result:
Fix up test result to match error message edit.
sql/share/czech/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/danish/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/dutch/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/english/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/estonian/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/french/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/german/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/greek/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/hungarian/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/italian/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/japanese/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/korean/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/norwegian-ny/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/norwegian/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/polish/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/portuguese/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/romanian/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/russian/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/serbian/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/slovak/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/spanish/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/swedish/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
sql/share/ukrainian/errmsg.txt:
Print user@host in syntax actually used for GRANT/REVOKE.
This is to avoid a test failure, which is fixed in 4.0 in
ChangeSet@1.1455.34.1, 2003-06-10 23:29:49+02:00, guilhem@mysql.com
by making RESET SLAVE reset the error.
mysql-test/r/rpl_loaddata.result:
temporary modification until 4.0 is merged in 4.1
mysql-test/t/rpl_loaddata.test:
temporary modification until 4.0 is merged in 4.1
and other replicate-*-table options in SHOW SLAVE STATUS.
Seems like it had not been done, so I push it now:
there's 4 new columns to SHOW SLAVE STATUS.
mysql-test/r/rpl000015.result:
Result update (more columns)
mysql-test/r/rpl_empty_master_crash.result:
Result update (more columns)
mysql-test/r/rpl_flush_log_loop.result:
Result update (more columns)
mysql-test/r/rpl_log.result:
Result update (more columns)
mysql-test/r/rpl_log_pos.result:
Result update (more columns)
mysql-test/r/rpl_redirect.result:
Result update (more columns)
mysql-test/r/rpl_replicate_do.result:
Result update (more columns)
mysql-test/r/rpl_rotate_logs.result:
Result update (more columns)
mysql-test/t/rpl_replicate_do.test:
Result update (more columns)
sql/slave.cc:
Print replicate_*_table options in SHOW SLAVE STATUS
sql/slave.h:
two functions to make a string of replicate_*_table lists.
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1
sql/field_conv.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_insert.cc:
Undo warnings for single row inserts
mysql-test/t/warnings.test:
undo one row warning instead use sql_warnings=1
mysql-test/r/warnings.result:
Fix result file
tests/client_test.c:
test for timestamp bug (BR #819)
sql/sql_insert.cc:
Enable warnings by default for single value list
protocol
mysql-test/t/warnings.test:
Updated test for single value list insert warning
mysql-test/r/warnings.result:
Updated warnings results
mysql-test/r/bdb.result:
Fix test result affected by error message edit.
mysql-test/r/innodb.result:
Fix test result affected by error message edit.
mysql-test/r/isam.result:
Fix test result affected by error message edit.
mysql-test/r/repair_part1.result:
Fix test result affected by error message edit.
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.)
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.
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.
