Below is the list of changes that have just been committed into a local
5.0 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.2208 06/07/03 22:58:10 tomas@stripped +1 -0
Merge tulin@stripped:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
sql/ha_ndbcluster.cc
1.269 06/07/03 22:58:01 tomas@stripped +0 -0
Auto merged
# 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/mysql-5.0-main/RESYNC
--- 1.268/sql/ha_ndbcluster.cc 2006-06-30 16:34:08 +02:00
+++ 1.269/sql/ha_ndbcluster.cc 2006-07-03 22:58:01 +02:00
@@ -2254,9 +2254,10 @@
{
Ndb *ndb= get_ndb();
Uint64 next_val= (Uint64) table->next_number_field->val_int() + 1;
+ char buff[22];
DBUG_PRINT("info",
- ("Trying to set next auto increment value to %llu",
- (ulonglong) next_val));
+ ("Trying to set next auto increment value to %s",
+ llstr(next_val, buff)));
if (ndb->setAutoIncrementValue((const NDBTAB *) m_table, next_val, TRUE)
== -1)
ERR_RETURN(ndb->getNdbError());
@@ -2582,13 +2583,15 @@
{
// Table with hidden primary key
int hidden_no= table->s->fields;
+ char buff[22];
const NDBTAB *tab= (const NDBTAB *) m_table;
const NDBCOL *hidden_col= tab->getColumn(hidden_no);
const NdbRecAttr* rec= m_value[hidden_no].rec;
DBUG_ASSERT(rec);
- DBUG_PRINT("hidden", ("%d: %s \"%llu\"", hidden_no,
- hidden_col->getName(), rec->u_64_value()));
- }
+ DBUG_PRINT("hidden", ("%d: %s \"%s\"", hidden_no,
+ hidden_col->getName(),
+ llstr(rec->u_64_value(), buff)));
+ }
print_results();
#endif
DBUG_VOID_RETURN;
@@ -4101,10 +4104,11 @@
// Set autoincrement
if (field->flags & AUTO_INCREMENT_FLAG)
{
+ char buff[22];
col.setAutoIncrement(TRUE);
ulonglong value= info->auto_increment_value ?
info->auto_increment_value : (ulonglong) 1;
- DBUG_PRINT("info", ("Autoincrement key, initial: %llu", value));
+ DBUG_PRINT("info", ("Autoincrement key, initial: %s", llstr(value, buff)));
col.setAutoIncrementInitialValue(value);
}
else
@@ -5493,8 +5497,9 @@
if (share->commit_count != 0)
{
*commit_count= share->commit_count;
- DBUG_PRINT("info", ("Getting commit_count: %llu from share",
- share->commit_count));
+ char buff[22];
+ DBUG_PRINT("info", ("Getting commit_count: %s from share",
+ llstr(share->commit_count, buff)));
pthread_mutex_unlock(&share->mutex);
free_share(share);
DBUG_RETURN(0);
@@ -5518,7 +5523,9 @@
pthread_mutex_lock(&share->mutex);
if (share->commit_count_lock == lock)
{
- DBUG_PRINT("info", ("Setting commit_count to %llu", stat.commit_count));
+ char buff[22];
+ DBUG_PRINT("info", ("Setting commit_count to %s",
+ llstr(stat.commit_count, buff)));
share->commit_count= stat.commit_count;
*commit_count= stat.commit_count;
}
@@ -5568,13 +5575,12 @@
char *full_name, uint full_name_len,
ulonglong *engine_data)
{
- DBUG_ENTER("ndbcluster_cache_retrieval_allowed");
-
Uint64 commit_count;
bool is_autocommit= !(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN));
char *dbname= full_name;
char *tabname= dbname+strlen(dbname)+1;
-
+ char buff[22], buff2[22];
+ DBUG_ENTER("ndbcluster_cache_retrieval_allowed");
DBUG_PRINT("enter", ("dbname: %s, tabname: %s, is_autocommit: %d",
dbname, tabname, is_autocommit));
@@ -5590,8 +5596,8 @@
DBUG_PRINT("exit", ("No, could not retrieve commit_count"));
DBUG_RETURN(FALSE);
}
- DBUG_PRINT("info", ("*engine_data: %llu, commit_count: %llu",
- *engine_data, commit_count));
+ DBUG_PRINT("info", ("*engine_data: %s, commit_count: %s",
+ llstr(*engine_data, buff), llstr(commit_count, buff2)));
if (commit_count == 0)
{
*engine_data= 0; /* invalidate */
@@ -5605,7 +5611,8 @@
DBUG_RETURN(FALSE);
}
- DBUG_PRINT("exit", ("OK to use cache, engine_data: %llu", *engine_data));
+ DBUG_PRINT("exit", ("OK to use cache, engine_data: %s",
+ llstr(*engine_data, buff)));
DBUG_RETURN(TRUE);
}
@@ -5638,10 +5645,10 @@
qc_engine_callback *engine_callback,
ulonglong *engine_data)
{
- DBUG_ENTER("ha_ndbcluster::register_query_cache_table");
-
+ Uint64 commit_count;
+ char buff[22];
bool is_autocommit= !(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN));
-
+ DBUG_ENTER("ha_ndbcluster::register_query_cache_table");
DBUG_PRINT("enter",("dbname: %s, tabname: %s, is_autocommit: %d",
m_dbname, m_tabname, is_autocommit));
@@ -5651,7 +5658,6 @@
DBUG_RETURN(FALSE);
}
- Uint64 commit_count;
if (ndb_get_commitcount(thd, m_dbname, m_tabname, &commit_count))
{
*engine_data= 0;
@@ -5660,7 +5666,7 @@
}
*engine_data= commit_count;
*engine_callback= ndbcluster_cache_retrieval_allowed;
- DBUG_PRINT("exit", ("commit_count: %llu", commit_count));
+ DBUG_PRINT("exit", ("commit_count: %s", llstr(commit_count, buff)));
DBUG_RETURN(commit_count > 0);
}
@@ -5841,12 +5847,13 @@
ndb_get_table_statistics(Ndb* ndb, const char * table,
struct Ndb_statistics * ndbstat)
{
- DBUG_ENTER("ndb_get_table_statistics");
- DBUG_PRINT("enter", ("table: %s", table));
NdbTransaction* pTrans;
NdbError error;
int retries= 10;
int retry_sleep= 30 * 1000; /* 30 milliseconds */
+ char buff[22], buff2[22], buff3[22], buff4[22];
+ DBUG_ENTER("ndb_get_table_statistics");
+ DBUG_PRINT("enter", ("table: %s", table));
do
{
@@ -5923,10 +5930,13 @@
ndbstat->row_size= sum_row_size;
ndbstat->fragment_memory= sum_mem;
- DBUG_PRINT("exit", ("records: %llu commits: %llu "
- "row_size: %llu mem: %llu count: %u",
- sum_rows, sum_commits, sum_row_size,
- sum_mem, count));
+ DBUG_PRINT("exit", ("records: %s commits: %s "
+ "row_size: %s mem: %s count: %u",
+ llstr(sum_rows, buff),
+ llstr(sum_commits, buff2),
+ llstr(sum_row_size, buff3),
+ llstr(sum_mem, buff4),
+ count));
DBUG_RETURN(0);
retry:
@@ -6461,9 +6471,12 @@
if (ndb_get_table_statistics(ndb, tabname, &stat) == 0)
{
+ char buff[22], buff2[22];
DBUG_PRINT("ndb_util_thread",
- ("Table: %s, commit_count: %llu, rows: %llu",
- share->table_name, stat.commit_count, stat.row_count));
+ ("Table: %s commit_count: %s rows: %s",
+ share->table_name,
+ llstr(stat.commit_count, buff),
+ llstr(stat.row_count, buff2)));
}
else
{
| Thread |
|---|
| • bk commit into 5.0 tree (tomas:1.2208) | tomas | 4 Jul |
