client/mysqlimport.c:
Remove disabled --use-threads option
mysql-test/r/mysqldump.result:
Update result
mysql-test/t/disabled.def:
Remove disable of mysqldump
mysql-test/t/mysqldump.test:
Remove the disable_parsing on tests for --use-threads to mysqlimport
mysql-test/r/rpl_bit_npk.result:
Updated results
mysql-test/t/disabled.def:
rpl_bit_npk now works
sql/field.h:
Field_bit::cmp_binary_offset wrongly used base class method that does not work for Field_bit
This was discussed with Monty and should be pushed into 5.0 too
sql/log_event.cc:
Added checks for null bits
Swapped use of m_after_image (was m_search_record) and table->record[1] to use record[i]
in the same way as other MySQL code (i.e. use record[1] for scan data).
Removed use of cmp_binary in record_compare (it is currently wrong to use that
without copying the null bits to the compare data record)
sql/log_event.h:
Name change to indicate new semantics
Set the ndbcluster slave port (bug#16780)
disabled.def:
Disabled 'mysqldump' until bug 17443 is closed
mysql-test/t/disabled.def:
Disabled 'mysqldump' until bug 17443 is closed
mysql-test/mysql-test-run.sh:
Set the ndbcluster slave port (bug#16780)
into mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
mysql-test/r/func_str.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
mysql-test/t/disabled.def:
Resolve conflict
mysql-test/t/disabled.def:
Updated
mysql-test/extra/rpl_tests/rpl_log.test:
Updated and moved drop of tables to end of test to help bin log be more deterministic
mysql-test/r/rpl_row_log.result:
Updated results
mysql-test/r/rpl_row_log_innodb.result:
Updated results
mysql-test/r/rpl_ndb_log.result:
Updated results
BitKeeper/deleted/.del-rpl_row_multi_update3.test~fcf9a2234bd0f1b:
Delete: mysql-test/t/rpl_row_multi_update3.test
BitKeeper/deleted/.del-rpl_row_multi_update3.test~b366698f8379f38f:
Delete: mysql-test/extra/rpl_tests/rpl_row_multi_update3.test
BitKeeper/deleted/.del-rpl_row_multi_update3.result~1a3a8438eaaf11f2:
Delete: mysql-test/r/rpl_row_multi_update3.result
mysql-test/t/rpl_ndb_commit_afterflush.test:
added comments
mysql-test/r/rpl_ndb_commit_afterflush.result:
New results file
mysql-test/t/rpl_ddl.test:
Added to skip default ndb engine
mysql-test/t/rpl_ndb_ddl.test:
new wrapper for ndb
mysql-test/r/rpl_ndb_ddl.result:
new wrapper for ndb
mysql-test/t/rpl_insert_ignore.test:
Added to skip ndb if default engine
mysql-test/t/rpl_ndb_insert_ignore.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_insert_ignore.result:
New Results file
mysql-test/t/rpl_multi_update2.test:
Updated to skip ndb default engine + added comments
mysql-test/t/rpl_ndb_multi_update2.test:
New ndb wrapper for test case
mysql-test/t/rpl_ndb_multi_update2-slave.opt:
New slave option file to go with new NDB test wrapper
mysql-test/r/rpl_ndb_multi_update2.result:
New results file
mysql-test/t/rpl_multi_update3.test:
Updated to skip ndb default engine + added comments
mysql-test/t/rpl_ndb_multi_update3.test:
New ndb wrapper for test case
mysql-test/r/rpl_ndb_multi_update3.result:
New results file
mysql-test/t/rpl_relayrotate.test:
added comments and ability to sjip when ndb is default engine
mysql-test/t/rpl_ndb_relayrotate.test:
New wrapper for ndb
mysql-test/t/rpl_ndb_relayrotate-slave.opt:
New option file for ndb slave
mysql-test/r/rpl_ndb_relayrotate.result:
New results file
mysql-test/t/rpl_loaddata.test:
Updated
mysql-test/t/rpl_multi_update.test:
Updated
mysql-test/t/rpl_relay_space_myisam.test:
Updated
mysql-test/t/rpl_row_001.test:
Updated
mysql-test/t/rpl_row_blob_myisam.test:
Updated
mysql-test/t/rpl_row_charset.test:
Updated
mysql-test/t/rpl_row_delayed_ins.test:
Updated
mysql-test/t/rpl_row_log.test:
Updated
mysql-test/t/rpl_row_UUID.test:
Updated
mysql-test/t/rpl_auto_increment.test:
Updated
mysql-test/t/rpl_commit_after_flush.test:
Updated
mysql-test/t/rpl_deadlock_innodb.test:
Updated
mysql-test/t/rpl_failed_optimize.test:
Updated
mysql-test/t/rpl_foreign_key_innodb.test:
Updated
mysql-test/t/rpl_insert_id_pk.test:
Updated
mysql-test/t/rpl_insert_id.test:
Updated
mysql-test/t/rpl_relay_space_innodb.test:
Updated
mysql-test/t/rpl_row_blob_innodb.test:
Updated
mysql-test/t/rpl_row_func003.test:
Updated
mysql-test/t/rpl_row_log_innodb.test:
Updated
mysql-test/t/rpl_row_sp002_innodb.test:
Updated
mysql-test/t/rpl_row_sp003.test:
Updated
mysql-test/t/rpl_row_sp006_InnoDB.test:
Updated
mysql-test/t/rpl_row_sp007_innodb.test:
Updated
mysql-test/t/rpl_ndb_row_001.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_row_001.result:
New results file
mysql-test/t/rpl_ndb_UUID.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_UUID.result:
New results file
mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test:
Updated with order by
mysql-test/r/rpl_row_delayed_ins.result:
Updated results file
mysql-test/t/rpl_ndb_charset.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_charset.result:
New results file
mysql-test/t/rpl_row_until.test:
Updated to skip when ndb is default. ndb bin logs are different size, so test would need to be rewitten for ndb
mysql-test/t/rpl_row_max_relay_size.test:
Updated
mysql-test/t/rpl_row_sp008.test:
Removed show binlog as it is not needed for test
mysql-test/r/rpl_row_sp008.result:
Updated results
mysql-test/t/rpl_row_basic_11bugs.test:
Removed show binlog as it is not needed for test
mysql-test/r/rpl_row_basic_11bugs.result:
Updated results
BitKeeper/deleted/.del-rpl_ndb_max_relay_size.test~afa6834a51627676:
Delete: mysql-test/t/rpl_ndb_max_relay_size.test
BitKeeper/deleted/.del-rpl_ndb_max_relay_size.result~1e944e2782e270d8:
Delete: mysql-test/r/rpl_ndb_max_relay_size.result
mysql-test/t/disabled.def:
Updated
into mysql.com:/home/jimw/my/mysql-5.1-clean
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
tests/mysql_client_test.c:
Auto merged
BitKeeper/deleted/.del-ndb_load.result:
Auto merged
BitKeeper/deleted/.del-ndb_load.test:
Auto merged
mysql-test/t/disabled.def:
Resolve conflict
If item->cached_table is set, find_field_in_tables() returns found field
even if it doesn't belong to current select. Because Item_field::fix_fields
doesn't expect such behaviour, reported bug occurs.
Item_field::fix_fields() was modifed to detect when find_field_in_tables()
can return field from outer select and process such fields accordingly.
In order to ease this code which was searching and processing outed fields was
moved into separate function called Item_field::fix_outer_field().
sql/item_subselect.h:
Fixed bug #15706: find_field_in_tables() returns field from outer select
Item_field::fix_outer_field() was marked as friend to Item_subselect class.
sql/item.h:
Fixed bug #15706: find_field_in_tables() returns field from outer select
fix_outer_field() function is added to the Item_field class.
sql/item.cc:
Fixed bug #15706: find_field_in_tables() returns field from outer select
Item_ref::fix_fields() and Item_field::fix_fields() were modifed to detect when
find_field_in_tables() can return field from outer select and process such
fields accordingly.
In order to ease this, code Item_field::fix_fields() which was searching and
processing outer fields was moved into separate function called
Item_field::fix_outer_field().
To the Item_field::fix_field() added a loop for finding context for found field.
mysql-test/t/disabled.def:
Fixed bug #15706: find_field_in_tables() returns field from outer select
Enable subselect test
- Update result file and enable test
mysql-test/r/binlog_row_mix_innodb_myisam.result:
Update resultfile, when switching from type to engine, the log position needs to be increased by two after that statement.
mysql-test/t/disabled.def:
Enable test
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
mysql-test/r/rpl_trigger.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/rpl_trigger.test:
Auto merged
- Change 94 to 95 according to Pem's instructions in bug report.
mysql-test/r/sp-code.result:
Update from 94 to 95 according to Pem's instructions
mysql-test/t/disabled.def:
Enable sp-code test case
mysql-test/t/ndb_dd_backuprestore.test:
Recovered new CDD test
mysql-test/r/ndb_dd_backuprestore.result:
Results will need to be recreated once bug #17045 is patched
mysql-test/t/disabled.def:
Added ndb_dd_backuprestore
mysql-test/t/rpl_ndb_delete_nowhere.test:
new wrapper for NDB engine
mysql-test/r/rpl_ndb_delete_nowhere.result:
new reults file
mysql-test/t/disabled.def:
Added test to be diabled
mysql-test/t/rpl_delete_no_where.test:
Fix typo
mysql-test/t/rpl_EE_err.test:
Updated wrapper
mysql-test/extra/rpl_tests/rpl_trig004.test:
Updated
mysql-test/t/rpl_row_trig004.test:
Updated
mysql-test/r/rpl_row_trig004.result:
Updated
mysql-test/t/rpl_ndb_trig004.test:
New wrapper for ndb
mysql-test/r/rpl_ndb_trig004.result:
New result
This is for bug#17384
mysql-test/r/mysqldump.result:
Changed result
mysql-test/t/disabled.def:
Re-enable after fixing bugs
mysql-test/t/mysqldump.test:
Added silent option
mysql-test/include/not_ndb_default.inc:
New include file to skip certain tests with default engine = ndb
mysql-test/t/rpl_optimize.test:
Updated to skip test when NDB is default engine
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
Updated to skip test when NDB is default engine
BitKeeper/deleted/.del-rpl_ndb_auto_inc-master.opt~e38255d94debc2c8:
Delete: mysql-test/t/rpl_ndb_auto_inc-master.opt
mysql-test/t/rpl_ndb_auto_inc.test:
updated to use with ndb
mysql-test/r/rpl_ndb_auto_inc.result:
New results
mysql-test/t/disabled.def:
Updated to remove rpl_ndb_auto_inc.test
mysql-test/extra/rpl_tests/rpl_row_blob.test:
updated to remove check table, not needed and not supported by ndb engine
mysql-test/t/rpl_ndb_blob2.test:
new ndb wrapper
mysql-test/r/rpl_ndb_blob2.result:
new results
Disabled 'rpl_until' until 15886 is solved
libmysqld.vcproj:
Added "my_user.c"
VC++Files/libmysqld/libmysqld.vcproj:
Added "my_user.c"
mysql-test/t/disabled.def:
Disabled 'rpl_until' until 15886 is solved
mysql-test/t/rpl_trigger.test:
Test cleanup
mysql-test/t/rpl_ndb_sync.test:
Test cleanup
mysql-test/t/rpl_ndb_idempotent.test:
Test cleanup
mysql-test/r/rpl_trigger.result:
Updated result files
mysql-test/r/rpl_ndb_sync.result:
Updated result files
mysql-test/r/rpl_ndb_idempotent.result:
Updated result files
mysql-test/t/rpl_ndb_dd_basic.test:
Rename: mysql-test/t/rpl_ndb_disk.test -> mysql-test/t/rpl_ndb_dd_basic.test
mysql-test/r/rpl_ndb_dd_basic.result:
Rename: mysql-test/t/rpl_ndb_dd_basic.result -> mysql-test/r/rpl_ndb_dd_basic.result
mysql-test/r/rpl_ndb_sp006.result:
New results file
mysql-test/t/rpl_row_sp007_innodb-slave.opt:
Ensure slave tables are created as innodb
mysql-test/t/disabled.def:
updated 17290
mysql-test/r/rpl_ndb_sp007.result:
New results file
mysql-test/t/rpl_ndb_sp007.test:
Added comment
mysql-test/t/rpl_ndb_sp006.test:
Added comment
mysql-test/extra/rpl_tests/rpl_row_sp003.test:
Augmented for use with NDB due to injector thread not populating the bin log before sync with master is done
mysql-test/r/rpl_ndb_sp003.result:
New results file
mysql-test/t/rpl_ndb_sp003.test:
Wrapper to use same code for testing NDB that is used for InnoDB Currently
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
BitKeeper/deleted/.del-ndb_load.result:
Delete: mysql-test/r/ndb_load.result
BitKeeper/deleted/.del-ndb_load.test:
Delete: mysql-test/t/ndb_load.test
extra/perror.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/sp-destruct.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Auto merged
storage/ndb/src/kernel/main.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
storage/ndb/tools/delete_all.cpp:
Auto merged
mysql-test/t/disabled.def:
Manual merge.
mysql-test/t/rpl_drop_temp.test:
Updated with work around stated by Tomas in bug 16552. NDB does not support temp tables.
mysql-test/r/rpl_drop_temp.result:
Updated with work around stated by Tomas in bug 16552. NDB does not support temp tables.
mysql-test/t/rpl_foreign_key_innodb-slave.opt:
Need to ensure that innodb table is created on the slave for this test
mysql-test/t/rpl_err_ignoredtable.test:
updated to run with ndb as default
mysql-test/r/rpl_err_ignoredtable.result:
updated to run with ndb as default
mysql-test/t/disabled.def:
Update requested by Lars
mysql-test/t/rpl_load_table_from_master.test:
Update requested by Lars
mysql-test/r/rpl_load_table_from_master.result:
Update requested by Lars
mysql-test/t/rpl_create_database.test:
Updated to pass when other default engines are being used
mysql-test/r/rpl_create_database.result:
Updated to pass when other default engines are being used
mysql-test/t/rpl_row_func003-slave.opt:
new opt file to enusre innodb on slave
mysql-test/t/rpl_replicate_do.test:
Updated with order by for use during ndb testing
mysql-test/r/rpl_replicate_do.result:
Updated with order by for use during ndb testing
mysql-test/t/rpl_redirect.test:
updated with order by
mysql-test/r/rpl_redirect.result:
updated with order by
mysql-test/t/rpl_ndb_func003.test:
New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_ndb_func003.result:
New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_row_sp001.result:
updated with order by
mysql-test/t/rpl_row_sp001.test:
updated with order by
BitKeeper/deleted/.del-rpl_row_log.test~f6ed1be9e3ca110f:
Delete: mysql-test/extra/rpl_tests/rpl_row_log.test
mysql-test/extra/rpl_tests/rpl_log.test:
Updated test to ensure that MyISAM, and innodb engines passed even if NDB was used as default engine. Due to diff in bin log output between MyISAM, InnoDB and NDB the file had to use different wrappers and results files.
mysql-test/t/rpl_row_log.test:
part of rpl_log.test check in
mysql-test/r/rpl_row_log.result:
part of rpl_log.test check in
mysql-test/r/rpl_row_log_innodb.result:
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-master.opt:
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-slave.opt:
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb.test:
part of rpl_log.test check in
mysql-test/r/rpl_ndb_log.result:
part of rpl_log.test check in
mysql-test/t/rpl_ndb_log.test:
part of rpl_log.test check in
mysql-test/t/rpl_ndb_log-master.opt:
part of rpl_log.test check in
mysql-test/t/disabled.def:
Updated with MySQL Bugs: #17158
