Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-08-14 14:52:16+02:00, mskold@stripped +7 -0
Merge mysql.com:/home/marty/MySQL/mysql-5.0
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1
MERGE: 1.1810.1937.6
mysql-test/r/ndb_lock.result@stripped, 2006-08-14 14:48:20+02:00, mskold@stripped +0 -12
Merge (using local)
MERGE: 1.5.1.7
mysql-test/r/ndb_read_multi_range.result@stripped, 2006-08-14 14:48:11+02:00, mskold@stripped +0 -0
Auto merged
MERGE: 1.3.1.3
mysql-test/t/ndb_lock.test@stripped, 2006-08-14 14:48:11+02:00, mskold@stripped +0 -0
Auto merged
MERGE: 1.7.1.7
mysql-test/t/ndb_read_multi_range.test@stripped, 2006-08-14 14:48:11+02:00, mskold@stripped +0 -0
Auto merged
MERGE: 1.4.1.3
sql/ha_ndbcluster.cc@stripped, 2006-08-14 14:52:13+02:00, mskold@stripped +2 -4
Merge
MERGE: 1.175.45.4
sql/ha_ndbcluster.h@stripped, 2006-08-14 14:52:13+02:00, mskold@stripped +0 -0
Merge
MERGE: 1.82.1.18
storage/ndb/include/ndbapi/NdbTransaction.hpp@stripped, 2006-08-14 14:48:11+02:00, mskold@stripped +0 -0
Auto merged
MERGE: 1.41.2.4
storage/ndb/include/ndbapi/NdbTransaction.hpp@stripped, 2006-08-14 14:48:11+02:00, mskold@stripped +0 -0
Merge rename: ndb/include/ndbapi/NdbTransaction.hpp -> storage/ndb/include/ndbapi/NdbTransaction.hpp
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: mskold
# Host: linux.site
# Root: /windows/Linux_space/MySQL/mysql-5.1/RESYNC
--- 1.41.2.3/ndb/include/ndbapi/NdbTransaction.hpp 2006-08-14 14:52:24 +02:00
+++ 1.47/storage/ndb/include/ndbapi/NdbTransaction.hpp 2006-08-14 14:52:24 +02:00
@@ -658,7 +658,7 @@ private:
// Release all cursor operations in connection
void releaseOps(NdbOperation*);
void releaseScanOperations(NdbIndexScanOperation*);
- void releaseExecutedScanOperation(NdbIndexScanOperation*);
+ void releaseScanOperation(NdbIndexScanOperation*);
// Set the transaction identity of the transaction
void setTransactionId(Uint64 aTransactionId);
@@ -794,7 +794,7 @@ private:
Uint8 thePendingBlobOps;
inline bool hasBlobOperation() { return theBlobFlag; }
- static void sendTC_COMMIT_ACK(NdbApiSignal *,
+ static void sendTC_COMMIT_ACK(class TransporterFacade *, NdbApiSignal *,
Uint32 transId1, Uint32 transId2,
Uint32 aBlockRef);
--- 1.347/sql/ha_ndbcluster.cc 2006-08-14 14:52:24 +02:00
+++ 1.348/sql/ha_ndbcluster.cc 2006-08-14 14:52:24 +02:00
@@ -256,13 +256,15 @@ int execute_no_commit_ignore_no_key(ha_n
}
inline
-int execute_no_commit(ha_ndbcluster *h, NdbTransaction *trans)
+int execute_no_commit(ha_ndbcluster *h, NdbTransaction *trans,
+ bool force_release)
{
#ifdef NOT_USED
int m_batch_execute= 0;
if (m_batch_execute)
return 0;
#endif
+ h->release_completed_operations(trans, force_release);
return h->m_ignore_no_key ?
execute_no_commit_ignore_no_key(h,trans) :
trans->execute(NdbTransaction::NoCommit,
@@ -297,13 +299,15 @@ int execute_commit(THD *thd, NdbTransact
}
inline
-int execute_no_commit_ie(ha_ndbcluster *h, NdbTransaction *trans)
+int execute_no_commit_ie(ha_ndbcluster *h, NdbTransaction *trans,
+ bool force_release)
{
#ifdef NOT_USED
int m_batch_execute= 0;
if (m_batch_execute)
return 0;
#endif
+ h->release_completed_operations(trans, force_release);
return trans->execute(NdbTransaction::NoCommit,
NdbTransaction::AO_IgnoreError,
h->m_force_send);
@@ -328,6 +332,7 @@ Thd_ndb::Thd_ndb()
all= NULL;
stmt= NULL;
error= 0;
+ query_state&= NDB_QUERY_NORMAL;
options= 0;
(void) hash_init(&open_tables, &my_charset_bin, 5, 0, 0,
(hash_get_key)thd_ndb_share_get_key, 0, 0);
@@ -1696,7 +1701,7 @@ int ha_ndbcluster::pk_read(const byte *k
ERR_RETURN(trans->getNdbError());
}
- if (execute_no_commit_ie(this,trans) != 0)
+ if (execute_no_commit_ie(this,trans,false) != 0)
{
table->status= STATUS_NOT_FOUND;
DBUG_RETURN(ndb_err(trans));
@@ -1761,7 +1766,7 @@ int ha_ndbcluster::complemented_read(con
}
}
- if (execute_no_commit(this,trans) != 0)
+ if (execute_no_commit(this,trans,false) != 0)
{
table->status= STATUS_NOT_FOUND;
DBUG_RETURN(ndb_err(trans));
@@ -1914,7 +1919,7 @@ int ha_ndbcluster::peek_indexed_rows(con
}
last= trans->getLastDefinedOperation();
if (first)
- res= execute_no_commit_ie(this,trans);
+ res= execute_no_commit_ie(this,trans,false);
else
{
// Table has no keys
@@ -1963,7 +1968,7 @@ int ha_ndbcluster::unique_index_read(con
if ((res= define_read_attrs(buf, op)))
DBUG_RETURN(res);
- if (execute_no_commit_ie(this,trans) != 0)
+ if (execute_no_commit_ie(this,trans,false) != 0)
{
table->status= STATUS_NOT_FOUND;
DBUG_RETURN(ndb_err(trans));
@@ -2011,7 +2016,7 @@ inline int ha_ndbcluster::fetch_next(Ndb
*/
if (m_ops_pending && m_blobs_pending)
{
- if (execute_no_commit(this,trans) != 0)
+ if (execute_no_commit(this,trans,false) != 0)
DBUG_RETURN(ndb_err(trans));
m_ops_pending= 0;
m_blobs_pending= FALSE;
@@ -2043,7 +2048,7 @@ inline int ha_ndbcluster::fetch_next(Ndb
{
if (m_transaction_on)
{
- if (execute_no_commit(this,trans) != 0)
+ if (execute_no_commit(this,trans,false) != 0)
DBUG_RETURN(-1);
}
else
@@ -2370,7 +2375,7 @@ int ha_ndbcluster::ordered_index_scan(co
ERR_RETURN(trans->getNdbError());
}
- if (execute_no_commit(this,trans) != 0)
+ if (execute_no_commit(this,trans,false) != 0)
DBUG_RETURN(ndb_err(trans));
DBUG_RETURN(next_result(buf));
@@ -2440,7 +2445,7 @@ int ha_ndbcluster::full_table_scan(byte
if ((res= define_read_attrs(buf, op)))
DBUG_RETURN(res);
- if (execute_no_commit(this,trans) != 0)
+ if (execute_no_commit(this,trans,false) != 0)
DBUG_RETURN(ndb_err(trans));
DBUG_PRINT("exit", ("Scan started successfully"));
DBUG_RETURN(next_result(buf));
@@ -2603,7 +2608,7 @@ int ha_ndbcluster::write_row(byte *recor
m_bulk_insert_not_flushed= FALSE;
if (m_transaction_on)
{
- if (execute_no_commit(this,trans) != 0)
+ if (execute_no_commit(this,trans,false) != 0)
{
m_skip_auto_increment= TRUE;
no_uncommitted_rows_execute_failure();
@@ -2840,7 +2845,7 @@ int ha_ndbcluster::update_row(const byte
op->setValue(no_fields, part_func_value);
}
// Execute update operation
- if (!cursor && execute_no_commit(this,trans) != 0) {
+ if (!cursor && execute_no_commit(this,trans,false) != 0) {
no_uncommitted_rows_execute_failure();
DBUG_RETURN(ndb_err(trans));
}
@@ -2926,7 +2931,7 @@ int ha_ndbcluster::delete_row(const byte
}
// Execute delete operation
- if (execute_no_commit(this,trans) != 0) {
+ if (execute_no_commit(this,trans,false) != 0) {
no_uncommitted_rows_execute_failure();
DBUG_RETURN(ndb_err(trans));
}
@@ -3392,6 +3397,26 @@ int ha_ndbcluster::close_scan()
NdbScanOperation *cursor= m_active_cursor ? m_active_cursor : m_multi_cursor;
+ if (m_lock_tuple)
+ {
+ /*
+ Lock level m_lock.type either TL_WRITE_ALLOW_WRITE
+ (SELECT FOR UPDATE) or TL_READ_WITH_SHARED_LOCKS (SELECT
+ LOCK WITH SHARE MODE) and row was not explictly unlocked
+ with unlock_row() call
+ */
+ NdbOperation *op;
+ // Lock row
+ DBUG_PRINT("info", ("Keeping lock on scanned row"));
+
+ if (!(op= cursor->lockCurrentTuple()))
+ {
+ m_lock_tuple= false;
+ ERR_RETURN(trans->getNdbError());
+ }
+ m_ops_pending++;
+ }
+ m_lock_tuple= false;
if (m_ops_pending)
{
/*
@@ -3399,7 +3424,7 @@ int ha_ndbcluster::close_scan()
deleteing/updating transaction before closing the scan
*/
DBUG_PRINT("info", ("ops_pending: %d", m_ops_pending));
- if (execute_no_commit(this,trans) != 0) {
+ if (execute_no_commit(this,trans,false) != 0) {
no_uncommitted_rows_execute_failure();
DBUG_RETURN(ndb_err(trans));
}
@@ -3793,7 +3818,7 @@ int ha_ndbcluster::end_bulk_insert()
m_bulk_insert_not_flushed= FALSE;
if (m_transaction_on)
{
- if (execute_no_commit(this, trans) != 0)
+ if (execute_no_commit(this, trans,false) != 0)
{
no_uncommitted_rows_execute_failure();
my_errno= error= ndb_err(trans);
@@ -3968,6 +3993,7 @@ int ha_ndbcluster::external_lock(THD *th
ERR_RETURN(ndb->getNdbError());
thd_ndb->init_open_tables();
thd_ndb->stmt= trans;
+ thd_ndb->query_state&= NDB_QUERY_NORMAL;
trans_register_ha(thd, FALSE, &ndbcluster_hton);
}
else
@@ -3983,6 +4009,7 @@ int ha_ndbcluster::external_lock(THD *th
ERR_RETURN(ndb->getNdbError());
thd_ndb->init_open_tables();
thd_ndb->all= trans;
+ thd_ndb->query_state&= NDB_QUERY_NORMAL;
trans_register_ha(thd, TRUE, &ndbcluster_hton);
/*
@@ -4139,6 +4166,7 @@ int ha_ndbcluster::start_stmt(THD *thd,
thd_ndb->stmt= trans;
trans_register_ha(thd, FALSE, &ndbcluster_hton);
}
+ thd_ndb->query_state&= NDB_QUERY_NORMAL;
m_active_trans= trans;
// Start of statement
@@ -7572,6 +7600,7 @@ ha_ndbcluster::read_multi_range_first(KE
NDB_INDEX_TYPE index_type= get_index_type(active_index);
ulong reclength= table_share->reclength;
NdbOperation* op;
+ Thd_ndb *thd_ndb= get_thd_ndb(current_thd);
if (uses_blob_value())
{
@@ -7585,7 +7614,7 @@ ha_ndbcluster::read_multi_range_first(KE
sorted,
buffer));
}
-
+ thd_ndb->query_state|= NDB_QUERY_MULTI_READ_RANGE;
m_disable_multi_read= FALSE;
/**
@@ -7757,7 +7786,7 @@ ha_ndbcluster::read_multi_range_first(KE
*/
m_current_multi_operation=
lastOp ? lastOp->next() : m_active_trans->getFirstDefinedOperation();
- if (!(res= execute_no_commit_ie(this, m_active_trans)))
+ if (!(res= execute_no_commit_ie(this, m_active_trans,true)))
{
m_multi_range_defined= multi_range_curr;
multi_range_curr= ranges;
@@ -9556,6 +9585,31 @@ ha_ndbcluster::generate_scan_filter(Ndb_
}
DBUG_RETURN(0);
+}
+
+
+void
+ha_ndbcluster::release_completed_operations(NdbTransaction *trans,
+ bool force_release)
+{
+ if (trans->hasBlobOperation())
+ {
+ /* We are reading/writing BLOB fields,
+ releasing operation records is unsafe
+ */
+ return;
+ }
+ if (!force_release)
+ {
+ if (get_thd_ndb(current_thd)->query_state & NDB_QUERY_MULTI_READ_RANGE)
+ {
+ /* We are batching reads and have not consumed all fetched
+ rows yet, releasing operation records is unsafe
+ */
+ return;
+ }
+ }
+ trans->releaseCompletedOperations();
}
/*
--- 1.144/sql/ha_ndbcluster.h 2006-08-14 14:52:24 +02:00
+++ 1.145/sql/ha_ndbcluster.h 2006-08-14 14:52:25 +02:00
@@ -534,6 +534,12 @@ class Ndb_cond_traverse_context
Ndb_rewrite_context *rewrite_stack;
};
+
+typedef enum ndb_query_state_bits {
+ NDB_QUERY_NORMAL = 0,
+ NDB_QUERY_MULTI_READ_RANGE = 1
+} NDB_QUERY_STATE_BITS;
+
/*
Place holder for ha_ndbcluster thread specific data
*/
@@ -571,6 +577,7 @@ class Thd_ndb
int error;
uint32 options;
List<NDB_SHARE> changed_tables;
+ uint query_state;
HASH open_tables;
};
@@ -833,6 +840,8 @@ private:
void no_uncommitted_rows_update(int);
void no_uncommitted_rows_reset(THD *);
+ void release_completed_operations(NdbTransaction*, bool);
+
/*
Condition pushdown
*/
@@ -849,8 +858,8 @@ private:
friend int execute_commit(ha_ndbcluster*, NdbTransaction*);
friend int execute_no_commit_ignore_no_key(ha_ndbcluster*, NdbTransaction*);
- friend int execute_no_commit(ha_ndbcluster*, NdbTransaction*);
- friend int execute_no_commit_ie(ha_ndbcluster*, NdbTransaction*);
+ friend int execute_no_commit(ha_ndbcluster*, NdbTransaction*, bool);
+ friend int execute_no_commit_ie(ha_ndbcluster*, NdbTransaction*, bool);
NdbTransaction *m_active_trans;
NdbScanOperation *m_active_cursor;
--- 1.12/mysql-test/t/ndb_lock.test 2006-08-14 14:52:25 +02:00
+++ 1.13/mysql-test/t/ndb_lock.test 2006-08-14 14:52:25 +02:00
@@ -73,7 +73,7 @@ drop table t1;
create table t1 (x integer not null primary key, y varchar(32), z integer, key(z)) engine = ndb;
-insert into t1 values (1,'one',1), (2,'two',2),(3,"three",3);
+insert into t1 values (1,'one',1);
# PK access
connection con1;
@@ -82,9 +82,20 @@ select * from t1 where x = 1 for update;
connection con2;
begin;
-select * from t1 where x = 2 for update;
--error 1205
select * from t1 where x = 1 for update;
+rollback;
+
+connection con1;
+rollback;
+insert into t1 values (2,'two',2),(3,"three",3);
+begin;
+select * from t1 where x = 1 for update;
+
+connection con2;
+--error 1205
+select * from t1 where x = 1 for update;
+select * from t1 where x = 2 for update;
rollback;
connection con1;
--- 1.7/mysql-test/r/ndb_read_multi_range.result 2006-08-14 14:52:25 +02:00
+++ 1.8/mysql-test/r/ndb_read_multi_range.result 2006-08-14 14:52:25 +02:00
@@ -286,10 +286,10 @@ INSERT INTO t1 VALUES
(406990,67,'2006-02-23 18:01:45'),(148815,67,'2005-10-25 15:34:17'),
(148812,67,'2005-10-25 15:30:01'),(245651,67,'2005-12-08 15:58:27'),
(154503,67,'2005-10-28 11:52:38');
-create table t11 select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3 asc;
-create table t12 select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3 desc;
+create table t11 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3 asc;
+create table t12 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3 desc;
create table t21 select * from t1 where b = 67 AND (c IS NULL OR c > '2005-12-08') order by 3 asc;
-create table t22 select * from t1 where b = 67 AND (c IS NULL OR c > '2005-12-08') order by 3 desc;
+create table t22 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c > '2005-12-08') order by 3 desc;
select * from t11 order by 1,2,3;
a b c
254 67 NULL
@@ -366,4 +366,65 @@ a b c
406993 67 2006-02-27 11:20:57
406994 67 2006-02-27 11:26:46
406995 67 2006-02-28 11:55:00
+select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a and t11.c is null order by t12.a;
+a
+255
+256
+update t22 set c = '2005-12-08 15:58:27' where a = 255;
+select * from t22 order by 1,2,3;
+a b c
+1 67 2006-02-23 15:01:35
+254 67 NULL
+255 67 2005-12-08 15:58:27
+256 67 NULL
+1120 67 NULL
+1133 67 NULL
+4101 67 NULL
+9199 67 NULL
+223456 67 NULL
+245651 67 2005-12-08 15:58:27
+245652 67 2005-12-08 15:58:27
+245653 67 2005-12-08 15:59:07
+245654 67 2005-12-08 15:59:08
+245655 67 2005-12-08 15:59:08
+398340 67 2006-02-20 04:38:53
+398341 67 2006-02-20 04:48:44
+398545 67 2006-02-20 04:53:13
+406631 67 2006-02-23 10:49:42
+406988 67 2006-02-23 17:07:22
+406989 67 2006-02-23 17:08:46
+406990 67 2006-02-23 18:01:45
+406991 67 2006-02-24 16:42:32
+406992 67 2006-02-24 16:47:18
+406993 67 2006-02-27 11:20:57
+406994 67 2006-02-27 11:26:46
+406995 67 2006-02-28 11:55:00
+select t21.* from t21,t22 where t21.a = t22.a and
+t22.a in (select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a and t11.c is null) and t22.c is null order by t21.a;
+a b c
+256 67 NULL
+delete from t22 where a > 245651;
+update t22 set b = a + 1;
+select * from t22 order by 1,2,3;
+a b c
+1 2 2006-02-23 15:01:35
+254 255 NULL
+255 256 2005-12-08 15:58:27
+256 257 NULL
+1120 1121 NULL
+1133 1134 NULL
+4101 4102 NULL
+9199 9200 NULL
+223456 223457 NULL
+245651 245652 2005-12-08 15:58:27
+select c, count(*)
+from t21
+inner join t22 using (a)
+where t22.b in (2,256,257,1121,1134,4102,9200,223457,245652)
+group by c
+order by c;
+c count(*)
+NULL 7
+2005-12-08 15:58:27 1
+2006-02-23 15:01:35 1
DROP TABLE t1, t11, t12, t21, t22;
--- 1.9/mysql-test/t/ndb_read_multi_range.test 2006-08-14 14:52:25 +02:00
+++ 1.10/mysql-test/t/ndb_read_multi_range.test 2006-08-14 14:52:25 +02:00
@@ -228,13 +228,32 @@ INSERT INTO t1 VALUES
(148812,67,'2005-10-25 15:30:01'),(245651,67,'2005-12-08 15:58:27'),
(154503,67,'2005-10-28 11:52:38');
-create table t11 select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3 asc;
-create table t12 select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3 desc;
+create table t11 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3 asc;
+create table t12 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3 desc;
create table t21 select * from t1 where b = 67 AND (c IS NULL OR c > '2005-12-08') order by 3 asc;
-create table t22 select * from t1 where b = 67 AND (c IS NULL OR c > '2005-12-08') order by 3 desc;
+create table t22 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c > '2005-12-08') order by 3 desc;
select * from t11 order by 1,2,3;
select * from t12 order by 1,2,3;
select * from t21 order by 1,2,3;
select * from t22 order by 1,2,3;
+
+# join tests
+select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a and t11.c is null order by t12.a;
+
+update t22 set c = '2005-12-08 15:58:27' where a = 255;
+select * from t22 order by 1,2,3;
+select t21.* from t21,t22 where t21.a = t22.a and
+t22.a in (select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a and t11.c is null) and t22.c is null order by t21.a;
+
+delete from t22 where a > 245651;
+update t22 set b = a + 1;
+select * from t22 order by 1,2,3;
+select c, count(*)
+from t21
+inner join t22 using (a)
+where t22.b in (2,256,257,1121,1134,4102,9200,223457,245652)
+group by c
+order by c;
+
DROP TABLE t1, t11, t12, t21, t22;
| Thread |
|---|
| • bk commit into 5.1 tree (mskold:1.2274) | Martin Skold | 14 Aug |
