Below is the list of changes that have just been committed into a local
5.1 repository of hartmut. When hartmut 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-10-23 01:23:04+02:00, hartmut@stripped +9 -0
DBUG_PRINT argument count warning fixes (Bug #23537)
mysys/hash.c@stripped, 2006-10-23 01:22:58+02:00, hartmut@stripped +1 -1
DBUG_PRINT argument count warning fixes (Bug #23537)
server-tools/instance-manager/user_map.cc@stripped, 2006-10-23 01:22:58+02:00, hartmut@stripped +1 -1
DBUG_PRINT argument count warning fixes (Bug #23537)
sql/event_data_objects.cc@stripped, 2006-10-23 01:22:58+02:00, hartmut@stripped +1 -1
DBUG_PRINT argument count warning fixes (Bug #23537)
sql/event_queue.cc@stripped, 2006-10-23 01:22:59+02:00, hartmut@stripped +1 -1
DBUG_PRINT argument count warning fixes (Bug #23537)
sql/ha_ndbcluster.cc@stripped, 2006-10-23 01:22:59+02:00, hartmut@stripped +3 -3
DBUG_PRINT argument count warning fixes (Bug #23537)
sql/handler.cc@stripped, 2006-10-23 01:22:59+02:00, hartmut@stripped +1 -1
DBUG_PRINT argument count warning fixes (Bug #23537)
sql/sql_cache.cc@stripped, 2006-10-23 01:22:59+02:00, hartmut@stripped +1 -1
DBUG_PRINT argument count warning fixes (Bug #23537)
storage/myisam/mi_page.c@stripped, 2006-10-23 01:22:59+02:00, hartmut@stripped +1 -1
DBUG_PRINT argument count warning fixes (Bug #23537)
storage/ndb/src/kernel/blocks/suma/Suma.cpp@stripped, 2006-10-23 01:22:59+02:00, hartmut@stripped +1 -1
DBUG_PRINT argument count warning fixes (Bug #23537)
# 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: hartmut
# Host: linux.site
# Root: /home/hartmut/projects/mysql/dev/5.1-maint
--- 1.24/storage/myisam/mi_page.c 2006-10-23 01:23:14 +02:00
+++ 1.25/storage/myisam/mi_page.c 2006-10-23 01:23:14 +02:00
@@ -80,7 +80,7 @@
my_errno=EINVAL;
DBUG_RETURN((-1));
}
- DBUG_PRINT("page",("write page at: %lu",(long) page,buff));
+ DBUG_PRINT("page",("write page at: %l (%p)",(long) page,buff));
DBUG_DUMP("buff",(byte*) buff,mi_getint(buff));
#endif
--- 1.49/mysys/hash.c 2006-10-23 01:23:14 +02:00
+++ 1.50/mysys/hash.c 2006-10-23 01:23:14 +02:00
@@ -655,7 +655,7 @@
}
if (found != records)
{
- DBUG_PRINT("error",("Found %ld of %ld records"));
+ DBUG_PRINT("error",("Found %ld of %ld records",found,records));
error=1;
}
if (records)
--- 1.276/sql/handler.cc 2006-10-23 01:23:14 +02:00
+++ 1.277/sql/handler.cc 2006-10-23 01:23:14 +02:00
@@ -3526,7 +3526,7 @@
int write_locked_table_maps(THD *thd)
{
DBUG_ENTER("write_locked_table_maps");
- DBUG_PRINT("enter", ("thd=%p, thd->lock=%p, thd->locked_tables=%p, thd->extra_lock",
+ DBUG_PRINT("enter", ("thd=%p, thd->lock=%p, thd->locked_tables=%p, thd->extra_lock=%p",
thd, thd->lock, thd->locked_tables, thd->extra_lock));
if (thd->get_binlog_table_maps() == 0)
--- 1.99/sql/sql_cache.cc 2006-10-23 01:23:14 +02:00
+++ 1.100/sql/sql_cache.cc 2006-10-23 01:23:14 +02:00
@@ -3977,7 +3977,7 @@
if (count != bins[i].number)
{
DBUG_PRINT("error", ("bin[%d].number is %d, but bin have %d blocks",
- bins[i].number, count));
+ i, bins[i].number, count));
result = 1;
}
}
--- 1.19/sql/event_queue.cc 2006-10-23 01:23:14 +02:00
+++ 1.20/sql/event_queue.cc 2006-10-23 01:23:14 +02:00
@@ -555,7 +555,7 @@
goto end;
}
- DBUG_PRINT("load_events_from_db", ("Adding 0x%lx to the exec list."));
+ DBUG_PRINT("load_events_from_db", ("Adding %p to the exec list.", et));
queue_insert_safe(&queue, (byte *) et);
count++;
}
--- 1.78/sql/event_data_objects.cc 2006-10-23 01:23:14 +02:00
+++ 1.79/sql/event_data_objects.cc 2006-10-23 01:23:14 +02:00
@@ -1187,7 +1187,7 @@
/* Let's check whether it was executed */
if (last_executed.year)
{
- DBUG_PRINT("info",("One-time event %s.%s of was already executed",
+ DBUG_PRINT("info",("One-time event %s.%s of %s was already executed",
dbname.str, name.str, definer.str));
dropped= (on_completion == Event_queue_element::ON_COMPLETION_DROP);
DBUG_PRINT("info",("One-time event will be dropped=%d.", dropped));
--- 1.48/storage/ndb/src/kernel/blocks/suma/Suma.cpp 2006-10-23 01:23:14 +02:00
+++ 1.49/storage/ndb/src/kernel/blocks/suma/Suma.cpp 2006-10-23 01:23:14 +02:00
@@ -4306,7 +4306,7 @@
// restarting suma will not respond to this until startphase 5
// since it is not until then data copying has been completed
- DBUG_PRINT("info",("Restarting subscriber: %u on key: [%u,%u]",
+ DBUG_PRINT("info",("Restarting subscriber: %u on key: [%u,%u] table: %u",
subbPtr.i,
subPtr.p->m_subscriptionId,
subPtr.p->m_subscriptionKey,
--- 1.360/sql/ha_ndbcluster.cc 2006-10-23 01:23:14 +02:00
+++ 1.361/sql/ha_ndbcluster.cc 2006-10-23 01:23:14 +02:00
@@ -9173,7 +9173,7 @@
context->supported= FALSE;
break;
case Item::REAL_ITEM:
- DBUG_PRINT("info", ("REAL_ITEM %s"));
+ DBUG_PRINT("info", ("REAL_ITEM"));
if (context->expecting(Item::REAL_ITEM))
{
Item_float *float_item= (Item_float *) item;
@@ -9221,7 +9221,7 @@
context->supported= FALSE;
break;
case Item::DECIMAL_ITEM:
- DBUG_PRINT("info", ("DECIMAL_ITEM %s"));
+ DBUG_PRINT("info", ("DECIMAL_ITEM"));
if (context->expecting(Item::DECIMAL_ITEM))
{
Item_decimal *decimal_item= (Item_decimal *) item;
@@ -10779,7 +10779,7 @@
table->field[c++]->store("NORMAL", 6, system_charset_info);
char extra[100];
- int len= my_snprintf(extra,sizeof(extra),"UNDO_BUFFER_SIZE=%lu",id,lfg.getUndoBufferSize());
+ int len= my_snprintf(extra,sizeof(extra),"UNDO_BUFFER_SIZE(%d)=%lu",id,lfg.getUndoBufferSize());
table->field[c]->set_notnull();
table->field[c]->store(extra, len, system_charset_info);
schema_table_store_record(thd, table);
--- 1.17/server-tools/instance-manager/user_map.cc 2006-10-23 01:23:14 +02:00
+++ 1.18/server-tools/instance-manager/user_map.cc 2006-10-23 01:23:14 +02:00
@@ -74,7 +74,7 @@
password_length= strlen(password);
if (password_length > SCRAMBLED_PASSWORD_CHAR_LENGTH)
{
- log_info("Error: password is too long (%d). Max length: %d. ",
+ log_info("Error: password is too long (%d). Max length: %d. "
"User line: '%s'.",
(int) password_length,
(int) SCRAMBLED_PASSWORD_CHAR_LENGTH,
| Thread |
|---|
| • bk commit into 5.1 tree (hartmut:1.2335) BUG#23537 | 'Hartmut Holzgraefe' | 23 Oct |
