Fixed Field_timestamp::val_int() so now it works correctly in --new mode
(or for TIMESTAMP(19) columns).
Also removed unused Field_timestamp::fill_and_store() method.
mysql-test/r/type_timestamp.result:
Added test for bug #8894 "TIMESTAMP values scrambled/misaligned when
using --new".
mysql-test/t/type_timestamp.test:
Added test for bug #8894 "TIMESTAMP values scrambled/misaligned when
using --new".
sql/field.cc:
Field_timestamp::fill_and_store()
Removed unused method.
Field_timestamp::val_int()
Even in --new mode integer representation of TIMESTAMP value should
not exceed 14 digits.
sql/field.h:
Removed unused Field_timestamp::fill_and_store() method.
My code in get_actual_tablename was not checking to make sure SHOW TABLES LIKE % was returning rows. Now I check that the resultset is not null and has at least 1 row before I process the table.
mysqldump.c:
Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows
client/mysqldump.c:
Add code to get_actual_tablename() to guard against SHOW TABLES LIKE not returning any rows
--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866)
client/mysqltest.c:
Add support for --disable_reconnect and --enable_reconnect
mysql-test/r/kill.result:
Update results
mysql-test/t/kill.test:
Fix test to actually verify that killing a connection is working,
and that automatic reconnect is working as desired.
sql-common/client.c:
Clean up MYSQL->stmts on reconnect by invalidating statements
not in the MYSQL_STMT_INIT_DONE state, and reconnecting others
to the new MYSQL object.
result" (and similar bug in ADDTIME/SUBTIME).
Both Item_func_add_time/Item_func_timediff::val_str() now use
calc_time_diff() function which was backported from 5.0 (and which
was was fixed to properly handle microseconds part of its second
argument). Also now we correctly set sign of result in case when
first argument is negative and second is positive.
mysql-test/r/func_sapdb.result:
Added test for bug #8068 "TIMEDIFF with first negative argument gives wrong
result".
mysql-test/t/func_sapdb.test:
Added test for bug #8068 "TIMEDIFF with first negative argument gives wrong
result".
sql/item_timefunc.cc:
- Backported calc_time_diff() function from 5.0 tree. Changed it to
accept time value as its second argument when its first argument
is datetime value. Fixed wrong handling of microsecond part of
second argument.
- Item_func_add_time::val_str()/Item_func_timediff::val_str()
Removed similar pieces of code calculating difference
between two datetime values (or their sum) in microseconds.
Now we use calc_time_diff() function instead.
Also now we correctly set sign of result in case when first
argument is negative and second is positive.
(BUG##9398, BUG#8703)
fixed wrong join view detection in multi-delete which lead to server crash
mysql-test/r/lowercase_view.result:
added new tests of updation and selection from the same table
mysql-test/r/view.result:
added new tests of updation and selection from the same table
added test of multidelete command over join view which lead to server crash
test suite from bugs #9398 and #8703
mysql-test/t/lowercase_view.test:
added new tests of updation and selection from the same table
mysql-test/t/view.test:
added new tests of updation and selection from the same table
added test of multidelete command over join view which lead to server crash
test suite from bugs #9398 and #8703
sql/sql_base.cc:
changed procedure of finding tables
sql/sql_class.cc:
added derived table procession detection
sql/sql_class.h:
added derived table procession detection
sql/sql_delete.cc:
fixed detection of selection from table which update for multidelete
sql/sql_derived.cc:
added derived table procession detection
sql/sql_lex.cc:
added detection os SELECTs processed inside derived tables
removed old mechanism of multidelete/multiupdate table duplication detection (which can't work with views)
sql/sql_lex.h:
added detection os SELECTs processed inside derived tables
removed old mechanism of multidelete/multiupdate table duplication detection (which can't work with views)
sql/sql_parse.cc:
removed wrong test of join view (for multidelete in can be not only first table)
sql/sql_prepare.cc:
added detection os SELECTs processed inside derived tables (reset it for reusing in PS/SP)
sql/sql_select.cc:
added detection os SELECTs processed inside derived tables
sql/sql_update.cc:
fixed detection of selection from table which update for multiupdate
Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
Prove that this problem was fixed with bug9425 fix too.
mysql-test/t/union.test:
Bug #6519 UNION with collation binary and latin1_swedish_ci fails now
Prove that this problem was fixed with bug9425 fix too.
Post merge additional fix for DECIMAL type:
Bugs: #9425: A user variable doesn't always have implicit coercibility
sql/item_func.cc:
Post merge additional fix for DECIMAL type:
Bugs: #9425: A user variable doesn't always have implicit coercibility
into eagle.intranet.mysql.r18.ru:/home/bar/mysql-5.0
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/item_func.cc:
Auto merged
Prove that the queries mentioned in
Bugs#5980: NULL requires a characterset in a union
works fine after recent changes related to itroducing
more coercibility level: IRNORABLE and SYSCONST.
mysql-test/r/ctype_utf8.result:
Prove that the queries mentioned in
Bugs#5980: NULL requires a characterset in a union
works fine after recent changes related to itroducing
more coercibility level: IRNORABLE and SYSCONST.
mysql-test/r/func_system.result:
Prove that the queries mentioned in
Bugs#5980: NULL requires a characterset in a union
works fine after recent changes related to itroducing
more coercibility level: IRNORABLE and SYSCONST.
mysql-test/t/ctype_utf8.test:
Prove that the queries mentioned in
Bugs#5980: NULL requires a characterset in a union
works fine after recent changes related to itroducing
more coercibility level: IRNORABLE and SYSCONST.
mysql-test/t/func_system.test:
Prove that the queries mentioned in
Bugs#5980: NULL requires a characterset in a union
works fine after recent changes related to itroducing
more coercibility level: IRNORABLE and SYSCONST.
#6559 "DROP DATABASE forgets to drop triggers".
If we drop table we should also drop all triggers associated with it.
To do this we have to check for existence of .TRG file when we are
dropping table and delete it too.
mysql-test/r/trigger.result:
Added tests for bugs #5859 "DROP TABLE does not drop triggers"
and #6559 "DROP DATABASE forgets to drop triggers".
mysql-test/t/trigger.test:
Added tests for bugs #5859 "DROP TABLE does not drop triggers"
and #6559 "DROP DATABASE forgets to drop triggers".
sql/handler.cc:
Added .TRG to the list of known extensions of files associated with
tables.
sql/mysql_priv.h:
Added declaration of constant holding extension for trigger files.
sql/sql_table.cc:
mysql_rm_table_part2():
If we drop table we should also drop all triggers associated with it.
To do this we have to check for existence of .TRG file and delete it
(until the moment when we will store trigger definitions in the same
.FRM file as table description).
sql/sql_trigger.cc:
Made constant holding extension for trigger files externally visible.
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
VC++Files/mysys/mysys.dsp:
Add my_windac.c to mysys.lib
include/my_sys.h:
Declarations for SECURITY_ATTRIBUTES create/destroy functions.
mysys/Makefile.am:
Add my_windac.c to the list of compiled files.
sql-common/client.c:
Lower requested access rights for events as the server won't
provide clients with ALL access in order to prevent denial
of service attack.
sql/mysqld.cc:
Set proper security attributes for the kernel objects to make them
usable when mysqld is running as a Windows service.
configure.in:
Adding logic to run blackhole configure option.
mysql-test/r/blackhole.result:
Correction this, but I think I need to see why the warning is being generated in the first place.
mysql-test/r/ps_1general.result:
Fix test case.
sql/handler.h:
Added federated to the list so that any beta users won't end up with a mismatch for table enum
configure.in:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/Makefile.am:
Edited for adding blackhole.
sql/handler.cc:
Edited for adding blackhole.
sql/handler.h:
Edited for blackhole.
This saves one byte per Query_log_event on disk compared to 5.0.[0..3]. Compatibility problems with 5.0.x where x<4
are explained in the comments in log_event.cc. Putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
If slave fails in Execute_load_query_log_event::exec_event(),
don't delete the file (so that it's re-usable at next START SLAVE).
And (youpi!) fix for BUG#3247 "a partially completed LOAD DATA INFILE is not
executed at all on the slave" (storing an Execute_load_query_log_event
to binlog, with its error code, instead of Delete_file_log_event).
mysql-test/r/mix_innodb_myisam_binlog.result:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_change_master.result:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_deadlock.result:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_error_ignored_table.result:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_flush_log_loop.result:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_loaddata.result:
we now use one less byte when storing the catalog in binlog so positions change.
Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table.
mysql-test/r/rpl_log.result:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_max_relay_size.result:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_relayrotate.result:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_replicate_do.result:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_rotate_logs.result:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/r/rpl_until.result:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/mysqlbinlog.test:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/mysqlbinlog2.test:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/rpl_deadlock.test:
we now use one less byte when storing the catalog in binlog so positions change
mysql-test/t/rpl_loaddata.test:
we now use one less byte when storing the catalog in binlog so positions change.
Plus testing replication of LOAD DATA INFILE if duplicate key and non-transactional table.
mysql-test/t/rpl_until.test:
we now use one less byte when storing the catalog in binlog so positions change
sql/log_event.cc:
a) We now store the catalog in Query_log_event in binlog WITHOUT its end zero.
This saves one byte per Query_log_event on disk. Compatibility problems with 5.0.x where x<4
are explained in the comments in this file.
b) putting back s/my_open(O_TRUNC)/(my_delete+my_create) change which had
been wiped away by somebody doing a wrong 4.1->5.0 merge (which happened just
before 5.0.3 :( ). Applying it to new events for LOAD DATA INFILE.
c) if slave fails in Execute_load_query_log_event::exec_event(),
don't delete the file (so that it's re-usable at next START SLAVE).
sql/log_event.h:
We now store the catalog in Query_log_event in binlog WITHOUT its end zero.
This saves one byte per Query_log_event on disk. This new storage for
the catalog is denoted by Q_CATALOG_NZ_CODE (couldn't re-use Q_CATALOG_CODE
as 5.0.3 slaves of this 5.0.4 master would segfault because it would
expect a 0 when there is none.
Renaming get_open_mode() to get_create_or_append() (see log_event.cc)
sql/sql_load.cc:
Fix for BUG#3247: if LOAD DATA INFILE fails but has permanently updated a table
(i.e. has deleted/added/modified some rows in a non-transactional table),
we must write an Execute_load_query_log_event to binlog (with the error code,
as this class beautifully inherits from Query_log_event, it can store
the error code - thanks Dmitri) and not a Delete_file_log_event (we use
to write a Delete_file_log_event: no update happened on slave, bug).
Moving UCS2 test into ctype_ucs
Bug#9232 Test failure: mysql_client_test and type_newdecimal
mysql-test/t/ctype_ucs.test:
Moving UCS2 test into ctype_ucs
Bug#9232 Test failure: mysql_client_test and type_newdecimal
mysql-test/t/type_newdecimal.test:
Moving UCS2 test into ctype_ucs
Bug#9232 Test failure: mysql_client_test and type_newdecimal
mysql-test/r/ctype_ucs.result:
Moving UCS2 test into ctype_ucs
Bug#9232 Test failure: mysql_client_test and type_newdecimal
mysql-test/r/type_newdecimal.result:
Moving UCS2 test into ctype_ucs
Bug#9232 Test failure: mysql_client_test and type_newdecimal
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
mysql-test/r/information_schema.result:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
-skip the print of 'MAX_ROWS=#' for 'SHOW CRETAE TABLE' with information schema tables
mysql-test/r/information_schema.result:
Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*
sql/sql_show.cc:
Fix for bug #8941: garbage MAX_ROWS=# from SHOW CREATE TABLE INFORMATION_SCHEMA.*
myisam/myisamchk.c:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.h:
Auto merged
mysql-test/r/func_str.result:
merging
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
