into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
sql/sql_yacc.yy:
Auto merged
mysql-test/t/rpl_ignore_table.test:
Merge, move the sync_slave_with_master up to correct place
This patch corrects errors that occurred in a local manual merge as a result
of updating the local repository and includes changes necessary to correct
problems found during the recalculation of next execution of events in RBR.
mysql-test/include/rpl_events.inc:
WL#3629 - Replication of Invocation and Invoked Features
This patch changes the rpl_events test to be more comprehensive in catching
errors as a result of RBR. Changes include clarification of SELECTs with
WHERE clauses and synchronization with master and slave.
mysql-test/r/rpl_events.result:
WL#3629 - Replication of Invocation and Invoked Features
This patch changes the results for the rpl_events test to accomodate the changes
in the test.
scripts/mysql_system_tables.sql:
WL#3629 - Replication of Invocation and Invoked Features
This patch adds the originator column and a new enum value to the mysql.event table.
This change was necessary to accomodate changes as a result of other patches.
sql/event_data_objects.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects an error in merging that occurred during manual merge.
The status check was changed to include either ENABLED or DISABLED in the
gate to change the status to SLAVESIDE_DISABLED for events replicated to
the slave.
This patch also includes an update to correct a problem encountered during
testing after the local merge. The update_timing_fields method is replicating
the timing changes in RBR to the slave thereby over writing the change to the
status column in the process. This code includes a check to turn off the next
binlog event if in RBR.
sql/event_queue.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects an error in merging that occurred during manual merge.
The code was corrected to include both types of disabled status enums
(DISABLED, SLAVESIDE_DISABLED) in the create_event and update_event methods.
sql/sql_show.cc:
WL#3629 - Replication of Invocation and Invoked Features
This patch corrects an error in merging that occurred during manual merge.
It corrects the order in which the originator column appears in the show
structures. The error caused incorrect output on SHOW EVENTS commands.
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
sql/sql_yacc.yy:
Auto merged
mysql-test/r/rpl_ignore_table.result:
Merge
mysql-test/t/rpl_ignore_table.test:
Merge, add a connection master to run following test on master
- quick workaround, better patch is needed later
- test case
mysql-test/r/rpl_ndb_basic.result:
Bug #27378 update becomes delete on slave
- test case
mysql-test/t/rpl_ndb_basic.test:
Bug #27378 update becomes delete on slave
- test case
sql/ha_ndbcluster.cc:
Bug #27378 update becomes delete on slave
- quick workaround, better patch is needed later
- GRANT and REVOKE statments didn't have the "updating" flag set and
thus statements with a table specified would not replicate if
slave filtering rules where turned on.
For example "GRANT ... ON test.t1 TO ..." would not replicate.
mysql-test/r/rpl_ignore_table.result:
Add test results
mysql-test/t/rpl_ignore_table.test:
Add tests
sql/sql_yacc.yy:
Pass option TL_OPTION_UPDATING to 'add_table_to_list' when parsing a
GRANT or REVOKE and a table specifier is found. This will set the
property "updating" on the table and thus the slave filtering rules will
be applied.
Without setting updating the statement will be not
replicated - since "it's not updating anything" - an optimization
to quickly skip SELECT's and similar.
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
client/mysqlbinlog.cc:
Auto merged
mysql-test/extra/binlog_tests/binlog.test:
Auto merged
mysql-test/r/binlog_row_binlog.result:
Auto merged
mysql-test/r/binlog_stm_binlog.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/lock.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/rpl_ndb_log.result:
Manual merge main->rpl 5.1
mysql-test/r/rpl_truncate_7ndb.result:
Manual merge main->rpl 5.1
sql/log.cc:
Manual merge main->rpl 5.1
sql/log_event.cc:
Manual merge main->rpl 5.1
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
mysql-test/r/func_group.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
mysql-test/t/openssl_1.test:
Auto merged
sql-common/my_time.c:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/mi_open.c:
Auto merged
mysql-test/r/create.result:
Manual merge
mysql-test/t/create.test:
Manual merge
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
myisam/mi_open.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/create.result:
Manual merge
mysql-test/t/create.test:
Manual merge
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
BitKeeper/deleted/.del-bdb_gis.result:
Auto merge
mysql-test/include/gis_generic.inc:
Auto merge
mysql-test/r/archive_gis.result:
?
Auto merge
mysql-test/r/innodb_gis.result:
Auto merge
mysql-test/r/ndb_gis.result:
Manual merge
mysql-test/r/strict.result:
Auto merge
mysql-test/r/type_date.result:
Auto merge
mysql-test/t/strict.test:
Auto merge
sql/field.cc:
Auto merge
sql/field.h:
Auto merge
mark the test as requiring that storage engine(if we need to do that)
Make --ndb and --with-ndbcluster and alias for
--mysqld=--default-storage-engine=ndbcluster
Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
mysql-test/include/gis_generic.inc:
Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
mysql-test/r/archive_gis.result:
Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
mysql-test/r/bdb_gis.result:
Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
mysql-test/r/innodb_gis.result:
Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
mysql-test/r/ndb_gis.result:
Revert test case to NOT define any keys; the NDB warning can be handled, and ARCHIVE does not allow indexes
into mysql.com:/home/psergey/mysql-5.1-merge
BitKeeper/deleted/.del-mysqld.cc.rej:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/t/range.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_list.h:
Auto merged
mysql-test/r/subselect.result:
Manual merge
mysql-test/t/subselect.test:
Manual merge
sql/opt_range.cc:
Manual merge
into mysql.com:/home/ram/work/b26359/b26359.5.0
mysql-test/r/strict.result:
Auto merged
mysql-test/t/strict.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
Bug #27381: InnoDB exits when attempting to rename table to non-existant database
Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
os_file_handle_error().
mysql-test/t/innodb.test:
Applied innodb-5.1-ss1381 snapshot
Revision r1373:
Port r1372 from branches/5.0: Merge a change from MySQL AB, and remove
the innodb_gis test case.
ChangeSet
2007/02/19 13:57:06+03:00 kaa@polly.local
Bug#18743: Several test cases fails if "classic" configuration in 5.0
The problem happened because those tests were using "cp932" and "ucs2"
without checking whether these character sets are available.
This fix moves test parts to make character set specific parts be
tested only if they are:
- some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
- some parts were moved to the newly added tests "innodb-ucs2.test",
"mysqlbinglog-cp932.test" and "sp-ucs2.test"
mysql-test/t/innodb.test
2007/02/19 13:57:02+03:00 kaa@polly.local +0 -222
Moved ucs2-specific test cases to innodb-ucs2.test
storage/innobase/Makefile.am:
Applied innodb-5.1-ss1381 snapshot
Revision r1353:
Makefile.am: EXTRA_DIST: Add the grammar source files to the
source distribution of MySQL.
storage/innobase/dict/dict0dict.c:
Applied innodb-5.1-ss1381 snapshot
Revision r1350:
Lock the data dictionary during rollback. This removes the rare
debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
dict_table_get_on_id() after the rollback following crash recovery.
storage/innobase/handler/ha_innodb.cc:
Applied innodb-5.1-ss1381 snapshot
Revision r1377:
Add static qualifiers to some symbols in ha_innodb.cc that are not
referenced from other modules.
Revision r1380:
Remove ha_innobase::last_query_id and references to thd->query_id.
MySQL calls external_lock at the beginning and end of a statement
when it is not calling start_stmt or commit or rollback. Thus,
statement boundaries can be (and are already) detected without
monitoring thd->query_id.
The function innobase_commit() seemingly lacks the call to
innobase_release_stat_resources(), which should be called at
the end of every SQL statement. The call was replaced by
equivalent statements by Vadim Tkachenko when he implemented
innodb_commit_concurrency in MySQL 5.0:
http://mysql.bkbits.net:8080/mysql-5.0/?PAGE=patch&REV=1.1886.70.1
Revision r1355:
class ha_innobase: Replace statistic_increment() with ha_statistic_increment().
ha_innobase::change_active_index(): Do not call current_thd unless
UNIV_DEBUG is defined.
Revision r1369:
Merge a change from MySQL AB:
ChangeSet@1.2409.1.83 2007-03-06 10:36:15-07:00 tsmith@hindu.god
Bug #26598: Create variable to allow turning off of statistic gathering
on metadata commands
Add innodb_stats_on_metadata option, which enables gathering
index statistics when processing metadata commands such as
SHOW TABLE STATUS. Default behavior of the server does not
change (this option is enabled by default).
Revision r1342:
Minor cleanup in ha_innodb.cc.
Remove the unused constants HA_INNOBASE_ROWS_IN_TABLE and
HA_INNOBASE_RANGE_COUNT. Declare innobase_active_counter static.
Revision r1381:
innobase_commit(): Correct the comments and formatting that were broken when
innodb_commit_concurrency was implemented.
Revision r1360:
Minor cleanup.
innobase_query_caching_of_table_permitted(): Make static.
ha_innobase::register_query_cache_table(): Move the function
definition from ha_innodb.h to ha_innodb.cc. Add comments.
storage/innobase/handler/ha_innodb.h:
Applied innodb-5.1-ss1381 snapshot
Revision r1377:
Add static qualifiers to some symbols in ha_innodb.cc that are not
referenced from other modules.
Revision r1380:
Remove ha_innobase::last_query_id and references to thd->query_id.
MySQL calls external_lock at the beginning and end of a statement
when it is not calling start_stmt or commit or rollback. Thus,
statement boundaries can be (and are already) detected without
monitoring thd->query_id.
The function innobase_commit() seemingly lacks the call to
innobase_release_stat_resources(), which should be called at
the end of every SQL statement. The call was replaced by
equivalent statements by Vadim Tkachenko when he implemented
innodb_commit_concurrency in MySQL 5.0:
http://mysql.bkbits.net:8080/mysql-5.0/?PAGE=patch&REV=1.1886.70.1
Revision r1369:
Merge a change from MySQL AB:
ChangeSet@1.2409.1.83 2007-03-06 10:36:15-07:00 tsmith@hindu.god
Bug #26598: Create variable to allow turning off of statistic gathering
on metadata commands
Add innodb_stats_on_metadata option, which enables gathering
index statistics when processing metadata commands such as
SHOW TABLE STATUS. Default behavior of the server does not
change (this option is enabled by default).
Revision r1360:
Minor cleanup.
innobase_query_caching_of_table_permitted(): Make static.
ha_innobase::register_query_cache_table(): Move the function
definition from ha_innodb.h to ha_innodb.cc. Add comments.
storage/innobase/include/trx0trx.h:
Applied innodb-5.1-ss1381 snapshot
Revision r1344:
Rename the Boolean field trx->type to trx->is_purge
and remove the constants TRX_USER and TRX_PURGE.
Revision r1343:
trx_sig_struct: Remove state. It is always assigned to TRX_SIG_WAITING
and never tested.
storage/innobase/os/os0file.c:
Applied innodb-5.1-ss1381 snapshot
Revision r1352:
Fix typo in comment in os/os0file.c
Approved by: heikki
Revision r1366:
Fix Bug#27381 by calling os_file_handle_error_no_exit() instead of
os_file_handle_error().
Approved by: Heikki
storage/innobase/row/row0undo.c:
Applied innodb-5.1-ss1381 snapshot
Revision r1350:
Lock the data dictionary during rollback. This removes the rare
debug assertion failure ut_ad(mutex_own(&(dict_sys->mutex))) in
dict_table_get_on_id() after the rollback following crash recovery.
storage/innobase/trx/trx0purge.c:
Applied innodb-5.1-ss1381 snapshot
Revision r1344:
Rename the Boolean field trx->type to trx->is_purge
and remove the constants TRX_USER and TRX_PURGE.
storage/innobase/trx/trx0trx.c:
Applied innodb-5.1-ss1381 snapshot
Revision r1344:
Rename the Boolean field trx->type to trx->is_purge
and remove the constants TRX_USER and TRX_PURGE.
Revision r1343:
trx_sig_struct: Remove state. It is always assigned to TRX_SIG_WAITING
and never tested.
into mysql.com:/home/ram/work/b26359/b26359.5.1
mysql-test/r/strict.result:
Auto merged
mysql-test/t/strict.test:
Auto merged
mysql-test/r/type_date.result:
merging
sql/field.cc:
merging
sql/field.h:
merging
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode
Problems:
1. storing a string to an integer field we don't check
if strntoull10rnd() returns MY_ERRNO_EDOM error.
Fix: check for MY_ERRNO_EDOM.
2. storing a string to an year field we use my_strntol() function.
Fix: use strntoull10rnd() instead.
mysql-test/r/strict.result:
Fix for bugs
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode
- test result.
mysql-test/r/type_date.result:
Fix for bugs
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode
- test result.
mysql-test/r/type_year.result:
Fix for bugs
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode
- test result.
mysql-test/t/strict.test:
Fix for bugs
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode
- test case.
mysql-test/t/type_year.test:
Fix for bugs
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode
sql/field.cc:
Fix for bugs
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode
- Field_num::get_int() method introduced. It converts a string to integer
then check errors and bounds.
- similar Field_tiny::store(const char...), Field_short::store(const char...),
Field_medium::store(const char...), Field_long::store(const char...)
rewritten, now they just call Field_num::get_int() then store value returned.
- Field_num::check_int() simplified.
- Field_year::store(const char...) now uses strntoull10rnd() and properly checks
errors returned.
sql/field.h:
Fix for bugs
#27176: Assigning a string to an year column has unexpected results
#26359: Strings becoming truncated and converted to numbers under STRICT mode
- check_int() moved to Field_num.
- get_int() introduced.
into siva.hindu.god:/home/tsmith/m/bk/maint/51
mysql-test/include/gis_generic.inc:
Auto merged
mysql-test/r/archive_gis.result:
Auto merged
mysql-test/r/innodb_gis.result:
Auto merged
mysql-test/r/ndb_gis.result:
Auto merged
BitKeeper/deleted/.del-bdb_gis.result:
Auto merged
sql/log.cc:
Auto merged
