sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_yacc.yy:
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/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.
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.
Data was not converted when ALTER TABLE CHAGE changed a field character set.
sql/field_conv.cc:
Data was not converted when ALTER TABLE CHAGE changed a field character set.
into mashka.mysql.fi:/home/my/mysql-4.1
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/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/italian/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/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
