into lmy004.:/work/mysql-5.1-tt-copy-works
sql/event.cc:
Auto merged
sql/event_executor.cc:
Auto merged
sql/event_timed.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
scripts/mysql_create_system_tables.sh:
SCCS merged
added option for verbose ndb startup
mysql-test/mysql-test-run.pl:
added option for relative pat in ndb config
mysql-test/ndb/ndbcluster.sh:
added option for relative pat in ndb config
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
libmysqld/lib_sql.cc:
logger initialization added
mysql-test/mysql-test-run.pl:
ndbcluster and ssl disabled in embedded server
mysql-test/mysql-test-run.sh:
ndbcluster disabled in embedded server
mysql-test/r/mysqltest.result:
result fixed
mysql-test/r/sp_notembedded.result:
result fixed
mysql-test/t/log_tables.test:
test disabled in embedded server
mysql-test/t/sp_notembedded.test:
test fixed
had to add order by
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
had to add order by
mysql-test/r/rpl_foreign_key_innodb.result:
had to add order by
BitKeeper/deleted/.del-not_ndb_table.inc~86f167fc49e34d38:
Delete: mysql-test/include/not_ndb_table.inc
BitKeeper/deleted/.del-not_ndb_table.require~1e81af954dbb864a:
Delete: mysql-test/r/not_ndb_table.require
mysql-test/extra/rpl_tests/rpl_foreign_key.test:
Cleanup test for NDB
mysql-test/t/rpl_foreign_key_innodb.test:
Cleanup test for NDB
mysql-test/r/rpl_foreign_key_innodb.result:
Cleanup test for NDB
mysql-test/t/rpl_optimize.test:
setting back to orginal values
WL#1034 (Internal CRON)
mysql-test/r/events.result:
add a test for to test bug #16431
mysql-test/t/events.test:
results of new tests
sql/event.cc:
- more debug info
- pass info to evex_remove_from_cache() whether the operation
was drop or alter. this fixes possible bug that may lead to dropping
of an event when it's altered. also fix for bug#16431
sql/event_executor.cc:
be more verbose and throw more errors
sql/event_timed.cc:
- add ` around the names of the db and the event_name and not
their concatenation. remove ; from the end - unneeded. this fixes bug #16431,
which was failing because after some recursion the query was ending on ;;
which is normally an error in the parser because that's the delimiter
- more debug info
- don't execute lex_end() two times when there's a parse error or thd->is_fatal_error
WL #1034 (Internal CRON)
mysql-test/r/events.result:
fix the results
mysql-test/t/disabled.def:
make it enabled
mysql-test/t/events.test:
- comment out some tests (having problems now)
- add test for fix for bug#16548
sql/sql_yacc.yy:
- fix for bug#16548 (Events: can't alter clause for preserve)
- prefix optional non-terminals with opt_
calculate ndbcluster slave port
mysql-test/mysql-test-run.pl:
calculate ndbcluster slave port
mysql-test/mysql-test-run.sh:
option to run mysql-test-run without binlog
sql/mysqld.cc:
option to run mysql-test-run without binlog
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
Fix sol10-amd64-a compile failure, conflict with system headers.
sql/log.cc:
Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/mysql_priv.h:
Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/sql_delete.cc:
Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/table.cc:
Rename macros to fix AIX conflict with system LOG_GENERAL macros.
sql/sql_parse.cc:
Fix HPUX compile failure, initializing char * with const char *
BACKUP previous set up triggers using DICT.
This lead to all kind of trouble.
An smaller alternative to using SUMA for backup
is to just make BACKUP handle triggers to TUP directly.
This way all triggers will be totally local,
and error handling is much simpler.
--- old impl.
Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
Master sends CREATE_TRIG_REQ for all tables to local DICT (dict master)
Master sends START_BACKUP_REQ to all paricipants with trigger ids from DICT
Master sends ALTER_TRIG_REQ (online) to local DICT
Master waits for GCP
Master starts distributed scan
When scan has finished
Master waits for GCP
Master sends DROP_TRIGGER to local DICT
Master sends STOP_BACKUP_REQ to all participants
--- new impl.
Start: Master recives GSN_DEFINE_BACKUP_CONF from all participants
Master sends START_BACKUP_REQ to all paricipants
Participand sends CREATE_TRIG_REQ for all tables to local TUP
Master waits for GCP
Master starts distributed scan
When scan has finished
Master waits for GCP
Master sends STOP_BACKUP_REQ to all participants
Participant sends DROP_TRIGGER to local TUP
Changes:
All trigger handling is _local_
This implies, that abort (e.g due to node failure) can be _local_
fix testBackup test so that it will run successfully with the (now correct)
backup trigger code.
storage/ndb/include/kernel/signaldata/BackupImpl.hpp:
rework START_BACKUP signals as we no longer need tableId and triggerIds.
storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp:
START_BACKUP_REQ no longer has tableIds and trigger ids
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Use TUP triggers directly.
removes ALTER trigger
simplifies DROP triggers
changes to node failure handling
changes in signal order
use SlaveData to track slave status.
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
- remove ALTER_TRIG (now unused)
- add signalNo to BackupRecord
- add SlaveData
- remove dead items from MasterData
- update prototype of startBackupReply
storage/ndb/src/kernel/blocks/backup/Backup.txt:
Update signals for new backup code.
storage/ndb/src/kernel/blocks/backup/BackupInit.cpp:
remove ALTER_TRIG REF and CONF as we no longer use them.
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Add comment about meaning of triggerId
Add sender BlockNumber parameter to dropTrigger.
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
for SUBSCRIPTION triggers, make it so that the trigger ids are private to each block.
storage/ndb/test/ndbapi/testBackup.cpp:
Don't do initial restart, just a restart. This is to avoid cache issues with
schema versions
storage/ndb/test/src/NdbBackup.cpp:
Update error insertions.
mysql-test/t/ndb_dd_ddl.test:
Updated test case with suggestions from omer
mysql-test/r/ndb_dd_ddl.result:
Updated test case with suggestions from omer
