[prev in list] [next in list] [prev in thread] [next in thread]
List: mysql-internals
Subject: bk commit into 5.1 tree (tomas:1.1899)
From: tomas () mysql ! com
Date: 2005-05-31 13:17:37
Message-ID: 20050531131737.54DC8802A2 () poseidon ! mysql ! com
[Download RAW message or body]
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
1.1899 05/05/31 15:17:26 tomas@poseidon.ndb.mysql.com +8 -0
merge
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
1.34 05/05/31 15:17:20 tomas@poseidon.ndb.mysql.com +0 -5
merge
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
1.61 05/05/31 15:17:20 tomas@poseidon.ndb.mysql.com +1 -0
merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
1.88 05/05/31 15:17:20 tomas@poseidon.ndb.mysql.com +0 -1
merge
storage/ndb/src/ndbapi/Ndb.cpp
1.63 05/05/31 15:17:20 tomas@poseidon.ndb.mysql.com +1 -2
merge
sql/sql_class.cc
1.196 05/05/31 15:17:20 tomas@poseidon.ndb.mysql.com +1 -1
merge
sql/mysql_priv.h
1.300 05/05/31 15:17:20 tomas@poseidon.ndb.mysql.com +1 -1
merge
sql/log_event.cc
1.197 05/05/31 15:17:20 tomas@poseidon.ndb.mysql.com +6 -2
merge
sql/ha_ndbcluster.cc
1.263 05/05/31 15:17:19 tomas@poseidon.ndb.mysql.com +2 -2
merge
# 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: tomas
# Host: poseidon.ndb.mysql.com
# Root: /home/tomas/wl2325-merge
--- 1.196/sql/log_event.cc 2005-05-25 18:55:57 +02:00
+++ 1.197/sql/log_event.cc 2005-05-31 15:17:20 +02:00
@@ -5016,16 +5016,18 @@
table->s->null_bytes, table->s->fields));
DBUG_ASSERT(record && row);
+ MY_BITMAP *write_set= table->file->write_set;
unsigned int const n_null_bytes= table->s->null_bytes;
ptrdiff_t const offset= record - (byte*) table->record[0];
memcpy(record, row, n_null_bytes);
char const* ptr= row + n_null_bytes;
+ bitmap_set_all(write_set);
size_t i= 0;
for (Field **field= table->field ; *field ; ++field, ++i)
{
- if (bitmap_fast_is_set(cols,i))
+ if (bitmap_is_set(cols,i))
{
Field *const f= *field;
DBUG_PRINT("info", ("unpack field '%s' from %p to %p+%d",
@@ -5035,6 +5037,8 @@
ptr= f->unpack(f->ptr + offset, ptr);
DBUG_DUMP("packed", old_ptr, ptr - old_ptr);
}
+ else
+ bitmap_clear_bit(write_set, i+1);
}
DBUG_PRINT("return", ("ptr=%p", ptr));
DBUG_RETURN(ptr);
@@ -5061,7 +5065,7 @@
{
// ULONG_MAX is used to flag fields that are not used and whose value
// should be ignored. This is similar to how InnoDB flags the fields.
- table->field[i]->query_id= bitmap_fast_is_set(cols,i) ? thd->query_id : ULONG_MAX;
+ table->field[i]->query_id= bitmap_is_set(cols,i) ? thd->query_id : ULONG_MAX;
DBUG_PRINT("info", ("Query id for field '%s' is %lu",
table->field[i]->field_name,
table->field[i]->query_id));
--- 1.299/sql/mysql_priv.h 2005-05-31 11:48:30 +02:00
+++ 1.300/sql/mysql_priv.h 2005-05-31 15:17:20 +02:00
@@ -1121,7 +1121,7 @@
LOCK_error_log, LOCK_delayed_insert, LOCK_uuid_generator,
LOCK_delayed_status, LOCK_delayed_create, LOCK_crypt, LOCK_timezone,
LOCK_slave_list, LOCK_active_mi, LOCK_manager, LOCK_global_read_lock,
- LOCK_global_system_variables, LOCK_user_conn;
+ LOCK_global_system_variables, LOCK_user_conn,
LOCK_bytes_sent, LOCK_bytes_received;
extern pthread_mutex_t LOCK_server_started;
extern pthread_cond_t COND_server_started;
--- 1.195/sql/sql_class.cc 2005-05-31 11:44:24 +02:00
+++ 1.196/sql/sql_class.cc 2005-05-31 15:17:20 +02:00
@@ -2068,7 +2068,7 @@
for (int i= 0 ; field ; i++, p_field++, field= *p_field)
{
- if (bitmap_fast_is_set(cols,i))
+ if (bitmap_is_set(cols,i))
{
DBUG_PRINT("info", ("pack field '%s' (%s) from "
"%p to %p+%d",
--- 1.62/storage/ndb/src/ndbapi/Ndb.cpp 2005-05-31 11:44:30 +02:00
+++ 1.63/storage/ndb/src/ndbapi/Ndb.cpp 2005-05-31 15:17:20 +02:00
@@ -231,10 +231,9 @@
void
Ndb::doDisconnect()
{
+ DBUG_ENTER("Ndb::doDisconnect");
NdbTransaction* tNdbCon;
CHECK_STATUS_MACRO_VOID;
- /* DBUG_ENTER must be after CHECK_STATUS_MACRO_VOID because of 'return' */
- DBUG_ENTER("Ndb::doDisconnect");
Uint32 tNoOfDbNodes = theImpl->theNoOfDBnodes;
Uint8 *theDBnodes= theImpl->theDBnodes;
--- 1.87/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp 2005-05-31 11:51:16 +02:00
+++ 1.88/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp 2005-05-31 15:17:20 +02:00
@@ -621,7 +621,6 @@
mi_type= 0;
m_dur= NdbDictionary::Event::ED_UNDEFINED;
m_tableImpl= NULL;
- m_bufferId= RNIL;
}
NdbEventImpl::~NdbEventImpl()
--- 1.60/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp 2005-05-31 02:55:02 +02:00
+++ 1.61/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp 2005-05-31 15:17:20 +02:00
@@ -1310,3 +1310,4 @@
}
template class Vector<Gci_container>;
+template class Vector<NdbEventBuffer::EventBufData_chunk*>;
--- 1.262/sql/ha_ndbcluster.cc 2005-05-31 11:47:57 +02:00
+++ 1.263/sql/ha_ndbcluster.cc 2005-05-31 15:17:19 +02:00
@@ -2156,7 +2156,7 @@
{
Field *field= table->field[i];
if (!(field->flags & PRI_KEY_FLAG) &&
- ((thd->query_id == field->query_id || m_retrieve_all_fields ) || !m_use_write) &&
+ (ha_get_bit_in_write_set(i+1) || !m_use_write) &&
set_ndb_value(op, field, i, record-table->record[0], &set_blob_value))
{
m_skip_auto_increment= TRUE;
@@ -2512,7 +2512,7 @@
{
DBUG_PRINT("info",("[%u] UNDEFINED",
(*value).rec->getColumn()->getColumnNo()));
- bitmap_fast_clear_bit(defined, (*value).rec->getColumn()->getColumnNo());
+ bitmap_clear_bit(defined, (*value).rec->getColumn()->getColumnNo());
}
}
else if (field->type() == MYSQL_TYPE_BIT)
--- 1.33/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp 2005-05-31 11:51:44 +02:00
+++ 1.34/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp 2005-05-31 15:17:20 +02:00
@@ -308,11 +308,6 @@
delete m_config_retriever;
m_config_retriever= NULL;
}
- if (ndb_global_event_buffer_mutex != NULL)
- {
- NdbMutex_Destroy(ndb_global_event_buffer_mutex);
- ndb_global_event_buffer_mutex= NULL;
- }
#ifdef VM_TRACE
if (ndb_print_state_mutex != NULL)
{
--
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe: http://lists.mysql.com/internals?unsub=mysql-internals@progressive-comp.com
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic