Moved out a lot of code into functions from external_lock and
start_stmt
Fixed a crashing bug at memory alloc failure
Merged the stmt and all variables into one trans variable
Always register start of statement as according to the
interface of the handlers.
Also register for start of transaction when not statement commit
== not autocommit AND no begin - commit ongoing
Now that we registered in a proper manner we also needed to handle
the commit call when end of statement and transaction is ongoing
Added start_stmt_count to know when we have start of statement
for first table
mysql-test/suite/ndb/r/ndb_lock_table.result:
Added a new test case for bug30996
mysql-test/suite/ndb/t/ndb_lock_table.test:
Added a new test case for bug30996
sql/ha_ndbcluster.cc:
Moved out a lot of code into functions from external_lock and
start_stmt
Fixed a crashing bug at memory alloc failure
Merged the stmt and all variables into one trans variable
Always register start of statement as according to the
interface of the handlers.
Also register for start of transaction when not statement commit
== not autocommit AND no begin - commit ongoing
Now that we registered in a proper manner we also needed to handle
the commit call when end of statement and transaction is ongoing
Added start_stmt_count to know when we have start of statement
for first table
sql/ha_ndbcluster.h:
New functions and merged variables
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-ndb
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
Auto merged
storage/ndb/test/src/Makefile.am:
merge
mysql-test/Makefile.am:
Add install data for new test case
storage/ndb/tools/restore/Restore.cpp:
Convert blob(text) length stored in main table
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl:
test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log:
test data for endian test
mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result:
test result for endian test
mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test:
test case for endian test
- problem is the database name accessed in Rows_log_event write... get_db() which is a pointer to the share string...
- point to table map instead?
- or copy it?
- or make sure that anything interacting with the share happens _after_ the epoch
Problem with flush is that STMT_END_F may not be included as it shoudld...
When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock
(found by pekkas blob changes)
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock
(found by pekkas blob changes)
sql/ha_ndbcluster.cc:
Bug#20872 master*.err: miscellaneous error messages
- only allocate share if fully successfull
sql/ha_ndbcluster_binlog.cc:
Bug#20872 master*.err: miscellaneous error messages
- only allocate share if fully successfull
- no need to print error, my_errno is set
sql/ha_ndbcluster_binlog.h:
Bug#20872 master*.err: miscellaneous error messages
- only allocate share if fully successfull
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
manual merge
storage/ndb/src/ndbapi/ndberror.c:
manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
manual merge
sql/ha_ndbcluster.cc:
remove warning for table exists in mysqld error log
sql/ha_ndbcluster_binlog.cc:
remove warning for table exists in mysqld error log
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
mysql-test/Makefile.am:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
mysql-test/suite/ndb/r/ndb_restore_compat.result:
Auto merged
mysql-test/suite/ndb/t/ndb_restore_compat.test:
Auto merged
Do not convert innodb autoincrement value to little endian when on
big endian systems.
storage/innobase/row/row0sel.c:
Do not convert innodb autoincrement value to little endian when on
big endian systems.
Removing unguarded read of slave_running field from inside
terminate_slave_threads(). This could cause premature exit in the event
that the slave thread already were shutting down, but isn't finished yet.
The fields slave_running, io_thd, and sql_thread are guarded by an
associated run_lock. A read of these fields were not guarded inside
terminate_slave_threads(), which caused an assertion to fire. The
assertion was removed, and the code reorganized slightly.
sql/slave.cc:
Changing signature of terminate_slave_thread() to accept a skip_lock
parameter instead of two mutexes. This mimics the signature of the
terminate_slave_threads() function. Code is also changed as a result
of this.
Removing unguarded check of slave_running field in the master info and
relay log info structure since that could cause premature exit of
terminate_slave_threads().
The thread variable for each of the slave threads can change before
acquiring the run_lock mutex inside terminate_slave_thread(). Hence
an assertion was removed that read the variable without guarding it
with run_lock.
Code that checked *slave_running status inside terminate_slave_thread()
was reorganized slightly.
sql/slave.h:
Moving terminate_slave_thread() to use internal linkage.
Index: ndb/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================
storage/ndb/src/mgmapi/mgmapi.cpp:
Bug#30681 mgmapi CHECK_TIMEDOUT_RET should be DBUG_CHECK_TIMEDOUT_RET
storage/innobase/handler/ha_innodb.cc:
Fix compiler warning: ::get_auto_increment takes a ulonglong
for nb_desired_values, but InnoDB's trx struct stores it as
a ulint (unsigned long). Probably harmless, as a single
statement won't be asking for more than 2^32 rows.
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
mysql-test/suite/ndb/r/ndb_restore.result:
Auto merged
mysql-test/suite/ndb/t/ndb_restore.test:
Auto merged
sql/ha_ndbcluster.cc:
manual merge
