into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb_improved_on-line_discover
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Merge
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
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
(pre-push)
mysql-test/r/events.result:
update result
mysql-test/t/events.test:
few more tests
sql/event.cc:
fix compilation failure after big merge
sql/event.h:
initialize s_ctx to be the context to be used.
don't use sphead->m_security_ctx but we will copy
the initted ctx to there
sql/event_timed.cc:
-initialize s_ctx to be the context to be used.
don't use sphead->m_security_ctx but we will copy
the initted ctx to there
- first init the context
- then compile the event
- and then copy the context
- don't use mysql_change_db() for now change_security_context() gets the
right context info
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
WL#1034
- This changeset also changes the executor so its quite more stable now.
Stressing test case added that executes ~800 events per second and dropping
hundreds of events at once using DROP DATABASE.
(with fixes after review of JimW)
(with fixes after review of Serg)
mysql-test/r/events.result:
update results after TRIGGER_ACL was added
mysql-test/t/events.test:
-redundant line
sql/event.cc:
Implemented evex_db_drop_events() which drops all events
from a specific database. Needed for SQLCOM_DROP_DATABASE
sql/event.h:
- protect the event better (see the changes to event_executor.cc
and event.cc). An event object could be used in a spawned thread
before it's executed but till now the object is marked as being
executed when the anonymous sp_head is executed. However, there are
timeframes before and after that during which the event is not marked
as executed and other thread may delete the object -> so we end with
a nirvana pointer.
sql/event_executor.cc:
- extract some of the code executed in the main thread to a function. Too long
functions are bad for the overview.
- prepend all information/error messages to the console with "SCHEDULER:" for
better overview, and easied searching in the log tables.
sql/event_priv.h:
- change the name, of evex_db_find_event_by_name() and don't
used C++ features like function overloading
- define consts for result returned from event_timed::spawn_now()
sql/event_timed.cc:
- add few methods related to event execution.
now the event spawns the worker thread and
passes itself as parameter. This way it locks itself for exectution
first and then spawning -> no race condition. When the worker thread
has finished working with the reference it calls back
event_timed::spawn_thread_finish() to unlock itself.
sql/sql_db.cc:
- call evex_drop_db_events() on DROP DATABASE
- remove timing dependent part of test, wait until condition occurs or sleep max 10 seconds
mysql-test/r/ndb_cache_multi2.result:
Update test results
mysql-test/t/ndb_cache_multi2.test:
Convert long sleeps to a while leep whith small sleeps and a check if condition has occured.
This allows slower machines to sleep longer if needed.
client/mysqltest.c:
Extend 'do_block' to be able to process a !<expression>.
Making it possible to do 'if(!$i)' and 'while(!$i)'
mysql-test/r/mysqltest.result:
Update test results
mysql-test/t/mysqltest.test:
Add test for if
Add test for while with ! expr
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
KEY event. Partitioning wrongly claimed to be able to handle HA_DUPP_POS
when it was supported by the underlying storage engine, which resulted
in a crash when handling REPLACE statements.
mysql-test/r/partition.result:
Add new results
mysql-test/t/partition.test:
Add regression test
sql/ha_partition.cc:
Fix list of table flags that are not passed through for partitioned
tables, and add HA_DUPP_POS to that list. Also, handle HA_EXTRA_FLUSH_CACHE
in ha_partition::extra().
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
A follow-up to BUG#15011 (already fixed).
mysql-test/r/sp.result:
Updated results for new handler tests.
mysql-test/t/sp.test:
Additional tests for nested handlers.
- 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
WL#1034 (Internal CRON)
(post-post-review updates)
mysql-test/r/events.result:
update results file
mysql-test/t/events.test:
add test for Bug #16410 Events: CREATE EVENT is legal in a CREATE TRIGGER statement
sql/sp_head.cc:
CREATE/ALTER/DROP event mean explicit commit, so they are not allowed in
a FUNCTION/TRIGGER. Fixes bug#16410
sql/sql_parse.cc:
- end active transaction for CREATE/ALTER/DROP EVENT because
they are DDL statements.
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
use part_info->no_subparts to calculate partition range in case of subpartitions
mysql-test/r/partition.result:
Fix for bug#16901 Partitions: crash, SELECT, column of part. function=first column of primary key
test case
mysql-test/t/partition.test:
Fix for bug#16901 Partitions: crash, SELECT, column of part. function=first column of primary key
test case
Also added a flush table test as well. Found one possible bug in OPTIMIZE TABLE which has never been reported, but I think it would be possible on a file system that ran out of disk.
mysql-test/r/archive.result:
New results
mysql-test/t/archive.test:
Added test for flush tables, which will also let me confirm DELAYED INSERT.
sql/ha_archive.cc:
Adding new stat
sql/ha_archive.h:
Just extending SHARE
