| List: | Commits | « Previous MessageNext Message » | |
| From: | 'Hartmut Holzgraefe' | Date: | October 30 2006 11:23am |
| Subject: | bk commit into 5.1 tree (hartmut:1.2338) BUG#23748 | ||
| View as plain text | |||
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-30 11:23:39+01:00, hartmut@stripped +40 -0 fix warnings about format placeholder vs integer size missmatches (Bug #23748) client/mysqlbinlog.cc@stripped, 2006-10-30 11:23:24+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) dbug/dbug_analyze.c@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +7 -7 fix warnings about format placeholder vs integer size missmatches (Bug #23748) libmysql/libmysql.c@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +2 -2 fix warnings about format placeholder vs integer size missmatches (Bug #23748) mysys/mf_keycache.c@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +7 -7 fix warnings about format placeholder vs integer size missmatches (Bug #23748) mysys/my_compress.c@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +2 -2 fix warnings about format placeholder vs integer size missmatches (Bug #23748) mysys/my_pread.c@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) mysys/my_read.c@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) mysys/thr_lock.c@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) server-tools/instance-manager/mysql_connection.cc@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +10 -10 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql-common/client.c@stripped, 2006-10-30 11:23:28+01:00, hartmut@stripped +2 -2 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/event_data_objects.cc@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +3 -3 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/event_scheduler.cc@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/ha_ndbcluster.cc@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +18 -18 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/ha_ndbcluster_binlog.cc@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +4 -4 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/item_cmpfunc.cc@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/item_timefunc.cc@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/log.cc@stripped, 2006-10-30 11:23:25+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/log_event.cc@stripped, 2006-10-30 11:23:26+01:00, hartmut@stripped +11 -11 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/mysqld.cc@stripped, 2006-10-30 11:23:26+01:00, hartmut@stripped +2 -2 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/net_serv.cc@stripped, 2006-10-30 11:23:26+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/opt_range.cc@stripped, 2006-10-30 11:23:26+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/rpl_tblmap.cc@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +5 -5 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/set_var.cc@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/slave.cc@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +7 -7 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/sql_acl.cc@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/sql_base.cc@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/sql_binlog.cc@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/sql_cache.cc@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +3 -3 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/sql_class.cc@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +3 -3 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/sql_class.h@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/sql_parse.cc@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +3 -3 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/sql_prepare.cc@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/sql_repl.cc@stripped, 2006-10-30 11:23:27+01:00, hartmut@stripped +2 -2 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/sql_table.cc@stripped, 2006-10-30 11:23:28+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) sql/unireg.cc@stripped, 2006-10-30 11:23:28+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) storage/innobase/handler/ha_innodb.cc@stripped, 2006-10-30 11:23:29+01:00, hartmut@stripped +2 -2 fix warnings about format placeholder vs integer size missmatches (Bug #23748) storage/myisammrg/ha_myisammrg.cc@stripped, 2006-10-30 11:23:29+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) storage/myisammrg/myrg_extra.c@stripped, 2006-10-30 11:23:30+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) storage/ndb/src/ndbapi/DictCache.cpp@stripped, 2006-10-30 11:23:30+01:00, hartmut@stripped +1 -1 fix warnings about format placeholder vs integer size missmatches (Bug #23748) vio/viossl.c@stripped, 2006-10-30 11:23:30+01:00, hartmut@stripped +2 -2 fix warnings about format placeholder vs integer size missmatches (Bug #23748) # 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.5/dbug/dbug_analyze.c 2006-10-30 11:23:51 +01:00 +++ 1.6/dbug/dbug_analyze.c 2006-10-30 11:23:51 +01:00 @@ -169,7 +169,7 @@ *name_pos = temp->pos; *time_entered = temp->time; *child_time = temp->children; - DBUG_PRINT ("pop", ("%d %d %d",*name_pos,*time_entered,*child_time)); + DBUG_PRINT ("pop", ("%d %lu %lu",*name_pos,*time_entered,*child_time)); rtnval = stacktop--; } DBUG_RETURN (rtnval); @@ -334,12 +334,12 @@ * function is found on the stack. */ while (pop (&oldpos, &oldtime, &oldchild)) { - DBUG_PRINT ("popped", ("%d %d", oldtime, oldchild)); + DBUG_PRINT ("popped", ("%lu %lu", oldtime, oldchild)); time = fn_time - oldtime; t = top (); t -> children += time; DBUG_PRINT ("update", ("%s", modules[t -> pos].name)); - DBUG_PRINT ("update", ("%d", t -> children)); + DBUG_PRINT ("update", ("%lu", t -> children)); time -= oldchild; modules[oldpos].m_time += time; modules[oldpos].m_calls++; @@ -520,19 +520,19 @@ unsigned long int calls, time; DBUG_ENTER ("out_body"); - DBUG_PRINT ("out_body", ("%d,%d",*s_calls,*s_time)); + DBUG_PRINT ("out_body", ("%lu,%lu",*s_calls,*s_time)); if (root == MAXPROCS) { - DBUG_PRINT ("out_body", ("%d,%d",*s_calls,*s_time)); + DBUG_PRINT ("out_body", ("%lu,%lu",*s_calls,*s_time)); } else { while (root != MAXPROCS) { out_body (outf, s_table[root].lchild,s_calls,s_time); out_item (outf, &modules[s_table[root].pos],&calls,&time); - DBUG_PRINT ("out_body", ("-- %d -- %d --", calls, time)); + DBUG_PRINT ("out_body", ("-- %lu -- %lu --", calls, time)); *s_calls += calls; *s_time += time; root = s_table[root].rchild; } - DBUG_PRINT ("out_body", ("%d,%d", *s_calls, *s_time)); + DBUG_PRINT ("out_body", ("%lu,%lu", *s_calls, *s_time)); } DBUG_VOID_RETURN; } --- 1.259/libmysql/libmysql.c 2006-10-30 11:23:51 +01:00 +++ 1.260/libmysql/libmysql.c 2006-10-30 11:23:51 +01:00 @@ -2094,7 +2094,7 @@ } stmt->bind= stmt->params + stmt->param_count; stmt->state= MYSQL_STMT_PREPARE_DONE; - DBUG_PRINT("info", ("Parameter count: %ld", stmt->param_count)); + DBUG_PRINT("info", ("Parameter count: %u", stmt->param_count)); DBUG_RETURN(0); } @@ -4403,7 +4403,7 @@ ulong bind_count= stmt->field_count; uint param_count= 0; DBUG_ENTER("mysql_stmt_bind_result"); - DBUG_PRINT("enter",("field_count: %d", bind_count)); + DBUG_PRINT("enter",("field_count: %lu", bind_count)); if (!bind_count) { --- 1.14/storage/myisammrg/myrg_extra.c 2006-10-30 11:23:51 +01:00 +++ 1.15/storage/myisammrg/myrg_extra.c 2006-10-30 11:23:51 +01:00 @@ -28,7 +28,7 @@ int error,save_error=0; MYRG_TABLE *file; DBUG_ENTER("myrg_extra"); - DBUG_PRINT("info",("function: %d",(ulong) function)); + DBUG_PRINT("info",("function: %lu",(ulong) function)); if (function == HA_EXTRA_CACHE) { --- 1.61/mysys/mf_keycache.c 2006-10-30 11:23:51 +01:00 +++ 1.62/mysys/mf_keycache.c 2006-10-30 11:23:51 +01:00 @@ -640,7 +640,7 @@ keycache->blocks_changed= 0; } - DBUG_PRINT("status", ("used: %d changed: %d w_requests: %lu " + DBUG_PRINT("status", ("used: %lu changed: %lu w_requests: %lu " "writes: %lu r_requests: %lu reads: %lu", keycache->blocks_used, keycache->global_blocks_changed, (ulong) keycache->global_cache_w_requests, @@ -1073,7 +1073,7 @@ if (block->temperature == BLOCK_WARM) keycache->warm_blocks--; block->temperature= BLOCK_HOT; - KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks=%u", + KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks=%lu", keycache->warm_blocks)); } link_block(keycache, block, hot, (my_bool)at_end); @@ -1092,7 +1092,7 @@ keycache->warm_blocks++; block->temperature= BLOCK_WARM; } - KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks=%u", + KEYCACHE_DBUG_PRINT("unreg_request", ("#warm_blocks=%lu", keycache->warm_blocks)); } } @@ -1345,9 +1345,9 @@ DBUG_ENTER("find_key_block"); KEYCACHE_THREAD_TRACE("find_key_block:begin"); - DBUG_PRINT("enter", ("fd: %u pos %lu wrmode: %lu", + DBUG_PRINT("enter", ("fd: %u pos %lu wrmode: %u", (uint) file, (ulong) filepos, (uint) wrmode)); - KEYCACHE_DBUG_PRINT("find_key_block", ("fd: %u pos: %lu wrmode: %lu", + KEYCACHE_DBUG_PRINT("find_key_block", ("fd: %u pos: %lu wrmode: %u", (uint) file, (ulong) filepos, (uint) wrmode)); #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) @@ -1641,7 +1641,7 @@ KEYCACHE_DBUG_ASSERT(page_status != -1); *page_st=page_status; KEYCACHE_DBUG_PRINT("find_key_block", - ("fd: %u pos %lu block->status %u page_status %lu", + ("fd: %u pos %lu block->status %u page_status %u", (uint) file, (ulong) filepos, block->status, (uint) page_status)); @@ -2341,7 +2341,7 @@ BLOCK_LINK *cache_buff[FLUSH_CACHE],**cache; int last_errno= 0; DBUG_ENTER("flush_key_blocks_int"); - DBUG_PRINT("enter",("file: %d blocks_used: %d blocks_changed: %d", + DBUG_PRINT("enter",("file: %d blocks_used: %lu blocks_changed: %lu", file, keycache->blocks_used, keycache->blocks_changed)); #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) --- 1.14/mysys/my_compress.c 2006-10-30 11:23:51 +01:00 +++ 1.15/mysys/my_compress.c 2006-10-30 11:23:51 +01:00 @@ -145,7 +145,7 @@ if (my_compress((byte*)data, &org_len, &comp_len)) goto err; - DBUG_PRINT("info", ("org_len: %d, comp_len: %d", org_len, comp_len)); + DBUG_PRINT("info", ("org_len: %lu, comp_len: %lu", org_len, comp_len)); DBUG_DUMP("compressed", (char*)data, org_len); error= 2; @@ -200,7 +200,7 @@ orglen= uint4korr((char*)&blob->head.orglen); ver= uint4korr((char*)&blob->head.ver); - DBUG_PRINT("blob",("ver: %d complen: %d orglen: %d", + DBUG_PRINT("blob",("ver: %lu complen: %lu orglen: %lu", ver,complen,orglen)); DBUG_DUMP("blob->data", (char*) blob->data, complen); --- 1.16/mysys/my_pread.c 2006-10-30 11:23:51 +01:00 +++ 1.17/mysys/my_pread.c 2006-10-30 11:23:51 +01:00 @@ -72,7 +72,7 @@ #endif if (error || readbytes != Count) { - DBUG_PRINT("warning",("Read only %ld bytes off %ld from %d, errno: %d", + DBUG_PRINT("warning",("Read only %u bytes off %u from %d, errno: %d", readbytes,Count,Filedes,my_errno)); #ifdef THREAD if ((readbytes == 0 || (int) readbytes == -1) && errno == EINTR) --- 1.11/mysys/my_read.c 2006-10-30 11:23:51 +01:00 +++ 1.12/mysys/my_read.c 2006-10-30 11:23:51 +01:00 @@ -48,7 +48,7 @@ if ((readbytes= (uint) read(Filedes, Buffer, Count)) != Count) { my_errno= errno ? errno : -1; - DBUG_PRINT("warning",("Read only %ld bytes off %ld from %d, errno: %d", + DBUG_PRINT("warning",("Read only %u bytes off %u from %d, errno: %d", readbytes, Count, Filedes, my_errno)); #ifdef THREAD if ((readbytes == 0 || (int) readbytes == -1) && errno == EINTR) --- 1.54/mysys/thr_lock.c 2006-10-30 11:23:51 +01:00 +++ 1.55/mysys/thr_lock.c 2006-10-30 11:23:51 +01:00 @@ -659,7 +659,7 @@ goto end; } } - DBUG_PRINT("lock",("write locked by thread: 0x%lx, type: %ld", + DBUG_PRINT("lock",("write locked by thread: 0x%lx, type: %d", lock->read.data->owner->info->thread_id, data->type)); } wait_queue= &lock->write_wait; --- 1.105/storage/myisammrg/ha_myisammrg.cc 2006-10-30 11:23:51 +01:00 +++ 1.106/storage/myisammrg/ha_myisammrg.cc 2006-10-30 11:23:51 +01:00 @@ -92,7 +92,7 @@ if (table->s->reclength != stats.mean_rec_length && stats.mean_rec_length) { - DBUG_PRINT("error",("reclength: %d mean_rec_length: %d", + DBUG_PRINT("error",("reclength: %lu mean_rec_length: %lu", table->s->reclength, stats.mean_rec_length)); goto err; } --- 1.225/sql/item_cmpfunc.cc 2006-10-30 11:23:51 +01:00 +++ 1.226/sql/item_cmpfunc.cc 2006-10-30 11:23:51 +01:00 @@ -3056,7 +3056,7 @@ if (!used_tables_cache) { owner->was_null|= (!cached_value); - DBUG_PRINT("info", ("cached :%d", cached_value)); + DBUG_PRINT("info", ("cached :%lld", cached_value)); DBUG_RETURN(cached_value); } if (args[0]->is_null()) --- 1.139/sql/item_timefunc.cc 2006-10-30 11:23:52 +01:00 +++ 1.140/sql/item_timefunc.cc 2006-10-30 11:23:52 +01:00 @@ -2379,7 +2379,7 @@ if (res->length() > (length= (uint32) res->charpos(cast_length))) { // Safe even if const arg char char_type[40]; - my_snprintf(char_type, sizeof(char_type), "%s(%lu)", + my_snprintf(char_type, sizeof(char_type), "%s(%u)", cast_cs == &my_charset_bin ? "BINARY" : "CHAR", length); if (!res->alloced_length()) --- 1.239/sql/log.cc 2006-10-30 11:23:52 +01:00 +++ 1.240/sql/log.cc 2006-10-30 11:23:52 +01:00 @@ -3637,7 +3637,7 @@ } if (thd->auto_inc_intervals_in_cur_stmt_for_binlog.nb_elements() > 0) { - DBUG_PRINT("info",("number of auto_inc intervals: %lu", + DBUG_PRINT("info",("number of auto_inc intervals: %u", thd->auto_inc_intervals_in_cur_stmt_for_binlog.nb_elements())); /* If the auto_increment was second in a table's index (possible with --- 1.246/sql/log_event.cc 2006-10-30 11:23:52 +01:00 +++ 1.247/sql/log_event.cc 2006-10-30 11:23:52 +01:00 @@ -831,7 +831,7 @@ LOG_EVENT_MINIMAL_HEADER_LEN); LOCK_MUTEX; - DBUG_PRINT("info", ("my_b_tell=%lu", my_b_tell(file))); + DBUG_PRINT("info", ("my_b_tell=%llu", my_b_tell(file))); if (my_b_read(file, (byte *) head, header_size)) { DBUG_PRINT("info", ("Log_event::read_log_event(IO_CACHE*,Format_desc*) \ @@ -1483,7 +1483,7 @@ } else time_zone_len= 0; - DBUG_PRINT("info",("Query_log_event has flags2=%lu sql_mode=%lu",flags2,sql_mode)); + DBUG_PRINT("info",("Query_log_event has flags2=%u sql_mode=%lu",flags2,sql_mode)); } #endif /* MYSQL_CLIENT */ @@ -1531,7 +1531,7 @@ common_header_len= description_event->common_header_len; post_header_len= description_event->post_header_len[event_type-1]; - DBUG_PRINT("info",("event_len=%ld, common_header_len=%d, post_header_len=%d", + DBUG_PRINT("info",("event_len=%u, common_header_len=%d, post_header_len=%d", event_len, common_header_len, post_header_len)); /* @@ -1579,7 +1579,7 @@ case Q_FLAGS2_CODE: flags2_inited= 1; flags2= uint4korr(pos); - DBUG_PRINT("info",("In Query_log_event, read flags2: %lu", flags2)); + DBUG_PRINT("info",("In Query_log_event, read flags2: %u", flags2)); pos+= 4; break; case Q_SQL_MODE_CODE: @@ -3354,7 +3354,7 @@ #ifndef DBUG_OFF char buff[22]; DBUG_ENTER("Rotate_log_event::Rotate_log_event(...,flags)"); - DBUG_PRINT("enter",("new_log_ident %s pos %s flags %lu", new_log_ident_arg, + DBUG_PRINT("enter",("new_log_ident %s pos %s flags %u", new_log_ident_arg, llstr(pos_arg, buff), flags)); #endif if (flags & DUP_NAME) @@ -4136,7 +4136,7 @@ memcpy(master_log, rli->group_master_log_name, master_log_len + 1); master_port = mi->port; master_pos = rli->group_master_log_pos; - DBUG_PRINT("info", ("master_log: %s pos: %d", master_log, + DBUG_PRINT("info", ("master_log: %s pos: %lu", master_log, (ulong) master_pos)); } else @@ -5328,7 +5328,7 @@ uint8 const common_header_len= description_event->common_header_len; uint8 const post_header_len= description_event->post_header_len[event_type-1]; - DBUG_PRINT("enter",("event_len=%ld, common_header_len=%d, " + DBUG_PRINT("enter",("event_len=%u, common_header_len=%d, " "post_header_len=%d", event_len, common_header_len, post_header_len)); @@ -5359,7 +5359,7 @@ const byte* const ptr_rows_data= var_start + byte_count + 1; my_size_t const data_size= event_len - (ptr_rows_data - (const byte *) buf); - DBUG_PRINT("info",("m_table_id=%lu, m_flags=%d, m_width=%u, data_size=%lu", + DBUG_PRINT("info",("m_table_id=%lu, m_flags=%d, m_width=%lu, data_size=%u", m_table_id, m_flags, m_width, data_size)); m_rows_buf= (byte*)my_malloc(data_size, MYF(MY_WME)); @@ -6044,7 +6044,7 @@ uint8 common_header_len= description_event->common_header_len; uint8 post_header_len= description_event->post_header_len[TABLE_MAP_EVENT-1]; - DBUG_PRINT("info",("event_len=%ld, common_header_len=%d, post_header_len=%d", + DBUG_PRINT("info",("event_len=%u, common_header_len=%d, post_header_len=%d", event_len, common_header_len, post_header_len)); DBUG_DUMP("event buffer", buf, event_len); @@ -6086,7 +6086,7 @@ uchar *ptr_after_colcnt= (uchar*) ptr_colcnt; m_colcnt= net_field_length(&ptr_after_colcnt); - DBUG_PRINT("info",("m_dblen=%d off=%d m_tbllen=%d off=%d m_colcnt=%d off=%d", + DBUG_PRINT("info",("m_dblen=%d off=%d m_tbllen=%d off=%d m_colcnt=%ld off=%d", m_dblen, ptr_dblen-(const byte*)vpart, m_tbllen, ptr_tbllen-(const byte*)vpart, m_colcnt, ptr_colcnt-(const byte*)vpart)); @@ -6496,7 +6496,7 @@ { DBUG_PRINT("info", ("Copying to %p " "from field %d at offset %u " - "to field %d at offset %u", + "to field %d at offset %lu", table->record[0], master_fields, master_reclength, table->s->fields, table->s->reclength)); --- 1.134/client/mysqlbinlog.cc 2006-10-30 11:23:52 +01:00 +++ 1.135/client/mysqlbinlog.cc 2006-10-30 11:23:52 +01:00 @@ -1138,7 +1138,7 @@ } if (len < 8 && net->read_pos[0] == 254) break; // end of data - DBUG_PRINT("info",( "len= %u, net->read_pos[5] = %d\n", + DBUG_PRINT("info",( "len= %lu, net->read_pos[5] = %d\n", len, net->read_pos[5])); if (!(ev= Log_event::read_log_event((const char*) net->read_pos + 1 , len - 1, &error_msg, --- 1.583/sql/mysqld.cc 2006-10-30 11:23:52 +01:00 +++ 1.584/sql/mysqld.cc 2006-10-30 11:23:52 +01:00 @@ -1609,7 +1609,7 @@ if (strlen(mysqld_unix_port) > (sizeof(UNIXaddr.sun_path) - 1)) { - sql_print_error("The socket file path is too long (> %lu): %s", + sql_print_error("The socket file path is too long (> %u): %s", sizeof(UNIXaddr.sun_path) - 1, mysqld_unix_port); unireg_abort(1); } @@ -4051,7 +4051,7 @@ int error; thread_created++; threads.append(thd); - DBUG_PRINT("info",(("creating thread %d"), thd->thread_id)); + DBUG_PRINT("info",(("creating thread %ld"), thd->thread_id)); thd->connect_time = time(NULL); if ((error=pthread_create(&thd->real_id,&connection_attrib, handle_one_connection, --- 1.96/sql/net_serv.cc 2006-10-30 11:23:52 +01:00 +++ 1.97/sql/net_serv.cc 2006-10-30 11:23:52 +01:00 @@ -809,7 +809,7 @@ { my_bool interrupted = vio_should_retry(net->vio); - DBUG_PRINT("info",("vio_read returned %d, errno: %d", + DBUG_PRINT("info",("vio_read returned %ld, errno: %d", length, vio_errno(net->vio))); #if !defined(__WIN__) || defined(MYSQL_SERVER) /* --- 1.242/sql/opt_range.cc 2006-10-30 11:23:52 +01:00 +++ 1.243/sql/opt_range.cc 2006-10-30 11:23:52 +01:00 @@ -2010,7 +2010,7 @@ uint idx; double scan_time; DBUG_ENTER("SQL_SELECT::test_quick_select"); - DBUG_PRINT("enter",("keys_to_use: %lu prev_tables: %lu const_tables: %lu", + DBUG_PRINT("enter",("keys_to_use: %llu prev_tables: %lu const_tables: %lu", keys_to_use.to_ulonglong(), (ulong) prev_tables, (ulong) const_tables)); DBUG_PRINT("info", ("records: %lu", (ulong) head->file->stats.records)); --- 1.288/sql/slave.cc 2006-10-30 11:23:52 +01:00 +++ 1.289/sql/slave.cc 2006-10-30 11:23:52 +01:00 @@ -239,7 +239,7 @@ bool look_for_description_event) { DBUG_ENTER("init_relay_log_pos"); - DBUG_PRINT("info", ("pos=%lu", pos)); + DBUG_PRINT("info", ("pos=%llu", pos)); *errmsg=0; pthread_mutex_t *log_lock=rli->relay_log.get_log_lock(); @@ -2850,7 +2850,7 @@ DBUG_RETURN(packet_error); } - DBUG_PRINT("info",( "len=%u, net->read_pos[4] = %d\n", + DBUG_PRINT("info",( "len=%lu, net->read_pos[4] = %d\n", len, mysql->net.read_pos[4])); DBUG_RETURN(len - 1); } @@ -3948,7 +3948,7 @@ /* Safe copy as 'rev' has been "sanitized" in Rotate_log_event's ctor */ memcpy(mi->master_log_name, rev->new_log_ident, rev->ident_len+1); mi->master_log_pos= rev->pos; - DBUG_PRINT("info", ("master_log_pos: '%s' %d", + DBUG_PRINT("info", ("master_log_pos: '%s' %lu", mi->master_log_name, (ulong) mi->master_log_pos)); #ifndef DBUG_OFF /* @@ -4092,7 +4092,7 @@ } delete ev; mi->master_log_pos+= inc_pos; - DBUG_PRINT("info", ("master_log_pos: %d", (ulong) mi->master_log_pos)); + DBUG_PRINT("info", ("master_log_pos: %lu", (ulong) mi->master_log_pos)); pthread_mutex_unlock(&mi->data_lock); DBUG_RETURN(0); } @@ -4148,7 +4148,7 @@ delete ev; mi->master_log_pos+= inc_pos; err: - DBUG_PRINT("info", ("master_log_pos: %d", (ulong) mi->master_log_pos)); + DBUG_PRINT("info", ("master_log_pos: %lu", (ulong) mi->master_log_pos)); pthread_mutex_unlock(&mi->data_lock); DBUG_RETURN(0); } @@ -4321,7 +4321,7 @@ rli->ign_master_log_pos_end= mi->master_log_pos; } rli->relay_log.signal_update(); // the slave SQL thread needs to re-check - DBUG_PRINT("info", ("master_log_pos: %d, event originating from the same server, ignored", (ulong) mi->master_log_pos)); + DBUG_PRINT("info", ("master_log_pos: %lu, event originating from the same server, ignored", (ulong) mi->master_log_pos)); } else { @@ -4329,7 +4329,7 @@ if (likely(!(rli->relay_log.appendv(buf,event_len,0)))) { mi->master_log_pos+= inc_pos; - DBUG_PRINT("info", ("master_log_pos: %d", (ulong) mi->master_log_pos)); + DBUG_PRINT("info", ("master_log_pos: %lu", (ulong) mi->master_log_pos)); rli->relay_log.harvest_bytes_written(&rli->log_space_total); } else --- 1.222/sql/sql_acl.cc 2006-10-30 11:23:52 +01:00 +++ 1.223/sql/sql_acl.cc 2006-10-30 11:23:52 +01:00 @@ -3871,7 +3871,7 @@ GRANT_COLUMN *grant_column; ulong want_access= grant->want_privilege & ~grant->privilege; DBUG_ENTER("check_grant_column"); - DBUG_PRINT("enter", ("table: %s want_access: %u", table_name, want_access)); + DBUG_PRINT("enter", ("table: %s want_access: %lu", table_name, want_access)); if (!want_access) DBUG_RETURN(0); // Already checked --- 1.356/sql/sql_base.cc 2006-10-30 11:23:52 +01:00 +++ 1.357/sql/sql_base.cc 2006-10-30 11:23:52 +01:00 @@ -2394,7 +2394,7 @@ { DBUG_PRINT("info", ("share: 0x%lx locked_by_logger: %d " "locked_by_flush: %d locked_by_name: %d " - "db_stat: %u version: %u", + "db_stat: %u version: %lu", (ulong) search->s, search->locked_by_logger, search->locked_by_flush, search->locked_by_name, search->db_stat, --- 1.100/sql/sql_cache.cc 2006-10-30 11:23:52 +01:00 +++ 1.101/sql/sql_cache.cc 2006-10-30 11:23:52 +01:00 @@ -1257,7 +1257,7 @@ #ifndef EMBEDDED_LIBRARY do { - DBUG_PRINT("qcache", ("Results (len %lu, used %lu, headers %lu)", + DBUG_PRINT("qcache", ("Results (len %lu, used %lu, headers %u)", result_block->length, result_block->used, result_block->headers_len()+ ALIGN_SIZE(sizeof(Query_cache_result)))); @@ -3043,7 +3043,7 @@ OPTION_TO_QUERY_CACHE))) && lex->safe_to_cache_query) { - DBUG_PRINT("qcache", ("options %lx %lx, type %u", + DBUG_PRINT("qcache", ("options %llx %llx, type %u", OPTION_TO_QUERY_CACHE, lex->select_lex.options, (int) thd->variables.query_cache_type)); @@ -3062,7 +3062,7 @@ } DBUG_PRINT("qcache", - ("not interesting query: %d or not cacheable, options %lx %lx, type %u", + ("not interesting query: %d or not cacheable, options %llx %llx, type %u", (int) lex->sql_command, OPTION_TO_QUERY_CACHE, lex->select_lex.options, --- 1.296/sql/sql_class.cc 2006-10-30 11:23:52 +01:00 +++ 1.297/sql/sql_class.cc 2006-10-30 11:23:52 +01:00 @@ -800,7 +800,7 @@ { list_include(prev_changed, curr, changed_table_dup(key, key_length)); DBUG_PRINT("info", - ("key_length %u %u", key_length, (*prev_changed)->key_length)); + ("key_length %lu %u", key_length, (*prev_changed)->key_length)); DBUG_VOID_RETURN; } else if (cmp == 0) @@ -810,7 +810,7 @@ { list_include(prev_changed, curr, changed_table_dup(key, key_length)); DBUG_PRINT("info", - ("key_length %u %u", key_length, + ("key_length %lu %u", key_length, (*prev_changed)->key_length)); DBUG_VOID_RETURN; } @@ -822,7 +822,7 @@ } } *prev_changed = changed_table_dup(key, key_length); - DBUG_PRINT("info", ("key_length %u %u", key_length, + DBUG_PRINT("info", ("key_length %lu %u", key_length, (*prev_changed)->key_length)); DBUG_VOID_RETURN; } --- 1.322/sql/sql_class.h 2006-10-30 11:23:52 +01:00 +++ 1.323/sql/sql_class.h 2006-10-30 11:23:52 +01:00 @@ -2055,7 +2055,7 @@ inline bool unique_add(void *ptr) { DBUG_ENTER("unique_add"); - DBUG_PRINT("info", ("tree %u - %u", tree.elements_in_tree, max_elements)); + DBUG_PRINT("info", ("tree %u - %lu", tree.elements_in_tree, max_elements)); if (tree.elements_in_tree > max_elements && flush()) DBUG_RETURN(1); DBUG_RETURN(!tree_insert(&tree, ptr, 0, tree.custom_arg)); --- 1.589/sql/sql_parse.cc 2006-10-30 11:23:52 +01:00 +++ 1.590/sql/sql_parse.cc 2006-10-30 11:23:52 +01:00 @@ -396,7 +396,7 @@ DBUG_PRINT("info", ("Capabilities: %lx packet_length: %ld Host: '%s' " "Login user: '%s' Priv_user: '%s' Using password: %s " - "Access: %u db: '%s'", + "Access: %lu db: '%s'", thd->client_capabilities, thd->max_client_packet_length, thd->main_security_ctx.host_or_ip, @@ -1002,7 +1002,7 @@ if (thd->client_capabilities & CLIENT_IGNORE_SPACE) thd->variables.sql_mode|= MODE_IGNORE_SPACE; #ifdef HAVE_OPENSSL - DBUG_PRINT("info", ("client capabilities: %d", thd->client_capabilities)); + DBUG_PRINT("info", ("client capabilities: %lu", thd->client_capabilities)); if (thd->client_capabilities & CLIENT_SSL) { /* Do the SSL layering. */ @@ -1158,7 +1158,7 @@ of handle_one_connection, which is thd. We need to know the start of the stack so that we could check for stack overruns. */ - DBUG_PRINT("info", ("handle_one_connection called by thread %d\n", + DBUG_PRINT("info", ("handle_one_connection called by thread %lu\n", thd->thread_id)); /* now that we've called my_thread_init(), it is safe to call DBUG_* */ --- 1.368/sql/sql_table.cc 2006-10-30 11:23:52 +01:00 +++ 1.369/sql/sql_table.cc 2006-10-30 11:23:52 +01:00 @@ -3746,7 +3746,7 @@ enum ha_extra_function function) { DBUG_ENTER("wait_while_table_is_used"); - DBUG_PRINT("enter", ("table: '%s' share: 0x%lx db_stat: %u version: %u", + DBUG_PRINT("enter", ("table: '%s' share: 0x%lx db_stat: %u version: %lu", table->s->table_name.str, (ulong) table->s, table->db_stat, table->s->version)); --- 1.88/sql/unireg.cc 2006-10-30 11:23:52 +01:00 +++ 1.89/sql/unireg.cc 2006-10-30 11:23:52 +01:00 @@ -478,7 +478,7 @@ { uint offset; - DBUG_PRINT("loop",("field: %d startpos: %lu length: %ld", + DBUG_PRINT("loop",("field: %d startpos: %lu length: %u", key_part->fieldnr, key_part->offset + data_offset, key_part->length)); int2store(pos,key_part->fieldnr+1+FIELD_NAME_USED); --- 1.28/sql/event_scheduler.cc 2006-10-30 11:23:52 +01:00 +++ 1.29/sql/event_scheduler.cc 2006-10-30 11:23:52 +01:00 @@ -605,7 +605,7 @@ */ state= STOPPING; - DBUG_PRINT("info", ("Manager thread has id %d", scheduler_thd->thread_id)); + DBUG_PRINT("info", ("Manager thread has id %ld", scheduler_thd->thread_id)); /* Lock from delete */ pthread_mutex_lock(&scheduler_thd->LOCK_delete); /* This will wake up the thread if it waits on Queue's conditional */ --- 1.79/sql/event_data_objects.cc 2006-10-30 11:23:52 +01:00 +++ 1.80/sql/event_data_objects.cc 2006-10-30 11:23:52 +01:00 @@ -1066,7 +1066,7 @@ case INTERVAL_LAST: DBUG_ASSERT(0); } - DBUG_PRINT("info", ("seconds=%ld months=%ld", seconds, months)); + DBUG_PRINT("info", ("seconds=%lld months=%lld", seconds, months)); if (seconds) { longlong seconds_diff; @@ -1090,7 +1090,7 @@ TIME_to_ulonglong_datetime(last_exec)) ++multiplier; interval.second= seconds * multiplier; - DBUG_PRINT("info", ("multiplier=%u interval.second=%u", multiplier, + DBUG_PRINT("info", ("multiplier=%u interval.second=%llu", multiplier, interval.second)); tmp= *start; if (!(ret= date_add_interval(&tmp, INTERVAL_SECOND, interval))) @@ -1737,7 +1737,7 @@ thd->update_charset(); - DBUG_PRINT("info",("old_sql_mode=%d new_sql_mode=%d",old_sql_mode, sql_mode)); + DBUG_PRINT("info",("old_sql_mode=%lu new_sql_mode=%lu",old_sql_mode, sql_mode)); thd->variables.sql_mode= this->sql_mode; /* Change the memory root for the execution time */ if (mem_root) --- 1.114/sql-common/client.c 2006-10-30 11:23:52 +01:00 +++ 1.115/sql-common/client.c 2006-10-30 11:23:52 +01:00 @@ -593,7 +593,7 @@ if (len == packet_error || len == 0) { - DBUG_PRINT("error",("Wrong connection or packet. fd: %s len: %d", + DBUG_PRINT("error",("Wrong connection or packet. fd: %s len: %lu", vio_description(net->vio),len)); #ifdef MYSQL_SERVER if (net->vio && vio_was_interrupted(net->vio)) @@ -1361,7 +1361,7 @@ DBUG_PRINT("info",("status: %u warning_count: %u", mysql->server_status, mysql->warning_count)); } - DBUG_PRINT("exit",("Got %d rows",result->rows)); + DBUG_PRINT("exit",("Got %llu rows",result->rows)); DBUG_RETURN(result); } --- 1.1/sql/rpl_tblmap.cc 2006-10-30 11:23:52 +01:00 +++ 1.2/sql/rpl_tblmap.cc 2006-10-30 11:23:52 +01:00 @@ -50,17 +50,17 @@ st_table* table_mapping::get_table(ulong table_id) { DBUG_ENTER("table_mapping::get_table(ulong)"); - DBUG_PRINT("enter", ("table_id=%d", table_id)); + DBUG_PRINT("enter", ("table_id=%lu", table_id)); entry *e= find_entry(table_id); if (e) { - DBUG_PRINT("info", ("tid %d -> table %p (%s)", + DBUG_PRINT("info", ("tid %lu -> table %p (%s)", table_id, e->table, MAYBE_TABLE_NAME(e->table))); DBUG_RETURN(e->table); } - DBUG_PRINT("info", ("tid %d is not mapped!", table_id)); + DBUG_PRINT("info", ("tid %lu is not mapped!", table_id)); DBUG_RETURN(NULL); } @@ -93,7 +93,7 @@ int table_mapping::set_table(ulong table_id, TABLE* table) { DBUG_ENTER("table_mapping::set_table(ulong,TABLE*)"); - DBUG_PRINT("enter", ("table_id=%d, table=%p (%s)", + DBUG_PRINT("enter", ("table_id=%lu, table=%p (%s)", table_id, table, MAYBE_TABLE_NAME(table))); entry *e= find_entry(table_id); @@ -111,7 +111,7 @@ e->table= table; my_hash_insert(&m_table_ids,(byte *)e); - DBUG_PRINT("info", ("tid %d -> table %p (%s)", + DBUG_PRINT("info", ("tid %lu -> table %p (%s)", table_id, e->table, MAYBE_TABLE_NAME(e->table))); DBUG_RETURN(0); // All OK --- 1.4/sql/sql_binlog.cc 2006-10-30 11:23:52 +01:00 +++ 1.5/sql/sql_binlog.cc 2006-10-30 11:23:52 +01:00 @@ -147,7 +147,7 @@ DBUG_PRINT("info",("ev->get_type_code()=%d", ev->get_type_code())); DBUG_PRINT("info",("bufptr+EVENT_TYPE_OFFSET=%p", bufptr+EVENT_TYPE_OFFSET)); - DBUG_PRINT("info", ("bytes_decoded=%d; bufptr=%p; buf[EVENT_LEN_OFFSET]=%u", + DBUG_PRINT("info", ("bytes_decoded=%d; bufptr=%p; buf[EVENT_LEN_OFFSET]=%lu", bytes_decoded, bufptr, uint4korr(bufptr+EVENT_LEN_OFFSET))); ev->thd= thd; if (int err= ev->exec_event(thd->rli_fake)) --- 1.29/storage/ndb/src/ndbapi/DictCache.cpp 2006-10-30 11:23:52 +01:00 +++ 1.30/storage/ndb/src/ndbapi/DictCache.cpp 2006-10-30 11:23:52 +01:00 @@ -128,7 +128,7 @@ DBUG_ENTER("GlobalDictCache::printCache"); NdbElement_t<Vector<TableVersion> > * curr = m_tableHash.getNext(0); while(curr != 0){ - DBUG_PRINT("curr", ("len: %d, hash: %d, lk: %d, str: %s", + DBUG_PRINT("curr", ("len: %d, hash: %d, lk: %ld, str: %s", curr->len, curr->hash, curr->localkey1, curr->str)); if (curr->theData){ Vector<TableVersion> * vers = curr->theData; --- 1.361/sql/ha_ndbcluster.cc 2006-10-30 11:23:52 +01:00 +++ 1.362/sql/ha_ndbcluster.cc 2006-10-30 11:23:52 +01:00 @@ -4273,7 +4273,7 @@ while ((share= it++)) { pthread_mutex_lock(&share->mutex); - DBUG_PRINT("info", ("Invalidate commit_count for %s, share->commit_count: %d ", + DBUG_PRINT("info", ("Invalidate commit_count for %s, share->commit_count: %llu ", share->key, share->commit_count)); share->commit_count= 0; share->commit_count_lock++; @@ -6488,7 +6488,7 @@ } { char buf[128]; - my_snprintf(buf, sizeof(buf), "mysqld --server-id=%d", server_id); + my_snprintf(buf, sizeof(buf), "mysqld --server-id=%lu", server_id); g_ndb_cluster_connection->set_name(buf); } g_ndb_cluster_connection->set_optimized_node_selection @@ -7150,7 +7150,7 @@ ("[%d] %p key: %s key_length: %d", i, share, share->key, share->key_length)); DBUG_PRINT("share", - ("db.tablename: %s.%s use_count: %d commit_count: %d", + ("db.tablename: %s.%s use_count: %d commit_count: %llu", share->db, share->table_name, share->use_count, share->commit_count)); #ifdef HAVE_NDB_BINLOG @@ -7245,7 +7245,7 @@ share->key_length= min_key_length; } share->key_length= - my_snprintf(share->key, min_key_length + 1, "#leak%d", + my_snprintf(share->key, min_key_length + 1, "#leak%lu", trailing_share_id++); } /* Keep it for possible the future trailing free */ @@ -7312,7 +7312,7 @@ ("%p key: %s key_length: %d", share, share->key, share->key_length)); DBUG_PRINT("rename_share", - ("db.tablename: %s.%s use_count: %d commit_count: %d", + ("db.tablename: %s.%s use_count: %d commit_count: %llu", share->db, share->table_name, share->use_count, share->commit_count)); if (share->table) @@ -7353,7 +7353,7 @@ ("%p key: %s key_length: %d", share, share->key, share->key_length)); DBUG_PRINT("get_share", - ("db.tablename: %s.%s use_count: %d commit_count: %d", + ("db.tablename: %s.%s use_count: %d commit_count: %llu", share->db, share->table_name, share->use_count, share->commit_count)); pthread_mutex_unlock(&ndbcluster_mutex); @@ -7451,7 +7451,7 @@ ("%p key: %s key_length: %d key: %s", share, share->key, share->key_length, key)); DBUG_PRINT("info", - ("db.tablename: %s.%s use_count: %d commit_count: %d", + ("db.tablename: %s.%s use_count: %d commit_count: %llu", share->db, share->table_name, share->use_count, share->commit_count)); if (!have_lock) @@ -7467,7 +7467,7 @@ ("%p key: %s key_length: %d", (*share), (*share)->key, (*share)->key_length)); DBUG_PRINT("real_free_share", - ("db.tablename: %s.%s use_count: %d commit_count: %d", + ("db.tablename: %s.%s use_count: %d commit_count: %llu", (*share)->db, (*share)->table_name, (*share)->use_count, (*share)->commit_count)); @@ -7521,7 +7521,7 @@ ("%p key: %s key_length: %d", *share, (*share)->key, (*share)->key_length)); DBUG_PRINT("free_share", - ("db.tablename: %s.%s use_count: %d commit_count: %d", + ("db.tablename: %s.%s use_count: %d commit_count: %llu", (*share)->db, (*share)->table_name, (*share)->use_count, (*share)->commit_count)); } @@ -8141,7 +8141,7 @@ my_thread_init(); DBUG_ENTER("ndb_util_thread"); - DBUG_PRINT("enter", ("ndb_cache_check_time: %d", ndb_cache_check_time)); + DBUG_PRINT("enter", ("ndb_cache_check_time: %lu", ndb_cache_check_time)); thd= new THD; /* note that contructor of THD uses DBUG_ */ THD_CHECK_SENTRY(thd); @@ -9150,7 +9150,7 @@ if (context->expecting(Item::INT_ITEM)) { Item_int *int_item= (Item_int *) item; - DBUG_PRINT("info", ("value %d", int_item->value)); + DBUG_PRINT("info", ("value %lld", int_item->value)); NDB_ITEM_QUALIFICATION q; q.value_type= Item::INT_ITEM; curr_cond->ndb_item= new Ndb_item(NDB_VALUE, q, item); @@ -9764,12 +9764,12 @@ update_status_variables(g_ndb_cluster_connection); buflen= my_snprintf(buf, sizeof(buf), - "cluster_node_id=%u, " + "cluster_node_id=%ld, " "connected_host=%s, " - "connected_port=%u, " - "number_of_data_nodes=%u, " - "number_of_ready_data_nodes=%u, " - "connect_count=%u", + "connected_port=%ld, " + "number_of_data_nodes=%ld, " + "number_of_ready_data_nodes=%ld, " + "connect_count=%ld", ndb_cluster_node_id, ndb_connected_host, ndb_connected_port, @@ -10691,7 +10691,7 @@ table->field[c++]->store("NORMAL", 6, system_charset_info); char extra[100]; - int len= my_snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u;UNDO_BUFFER_SIZE=%lu",id,lfg.getUndoBufferSize()); + int len= my_snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u;UNDO_BUFFER_SIZE=%u",id,lfg.getUndoBufferSize()); table->field[c]->set_notnull(); table->field[c]->store(extra, len, system_charset_info); schema_table_store_record(thd, table); @@ -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(%d)=%lu",id,lfg.getUndoBufferSize()); + int len= my_snprintf(extra,sizeof(extra),"UNDO_BUFFER_SIZE(%d)=%u",id,lfg.getUndoBufferSize()); table->field[c]->set_notnull(); table->field[c]->store(extra, len, system_charset_info); schema_table_store_record(thd, table); --- 1.308/storage/innobase/handler/ha_innodb.cc 2006-10-30 11:23:52 +01:00 +++ 1.309/storage/innobase/handler/ha_innodb.cc 2006-10-30 11:23:52 +01:00 @@ -4445,7 +4445,7 @@ } if (error) { - DBUG_PRINT("error", ("Got error: %ld", error)); + DBUG_PRINT("error", ("Got error: %d", error)); DBUG_RETURN(error); } @@ -4455,7 +4455,7 @@ error = index_read(buf, pos, ref_length, HA_READ_KEY_EXACT); if (error) { - DBUG_PRINT("error", ("Got error: %ld", error)); + DBUG_PRINT("error", ("Got error: %d", error)); } change_active_index(keynr); --- 1.196/sql/set_var.cc 2006-10-30 11:23:52 +01:00 +++ 1.197/sql/set_var.cc 2006-10-30 11:23:52 +01:00 @@ -3945,7 +3945,7 @@ DBUG_RETURN(TRUE); } - DBUG_PRINT("new_value", ("%lu", (bool)var->save_result.ulong_value)); + DBUG_PRINT("new_value", ("%d", (bool)var->save_result.ulong_value)); Item_result var_type= var->value->result_type(); --- 1.16/server-tools/instance-manager/mysql_connection.cc 2006-10-30 11:23:52 +01:00 +++ 1.17/server-tools/instance-manager/mysql_connection.cc 2006-10-30 11:23:52 +01:00 @@ -165,7 +165,7 @@ void Mysql_connection_thread::run() { - log_info("accepted mysql connection %d", connection_id); + log_info("accepted mysql connection %lu", connection_id); my_thread_init(); @@ -175,7 +175,7 @@ return; } - log_info("connection %d is checked successfully", connection_id); + log_info("connection %lu is checked successfully", connection_id); vio_keepalive(vio, TRUE); @@ -314,7 +314,7 @@ packet= (char*) net.read_pos; enum enum_server_command command= (enum enum_server_command) (uchar) *packet; - log_info("connection %d: packet_length=%d, command=%d", + log_info("connection %lu: packet_length=%lu, command=%d", connection_id, packet_length, command); return dispatch_command(command, packet + 1, packet_length - 1); } @@ -325,27 +325,27 @@ { switch (command) { case COM_QUIT: // client exit - log_info("query for connection %d received quit command", connection_id); + log_info("query for connection %lu received quit command", connection_id); return 1; case COM_PING: - log_info("query for connection %d received ping command", connection_id); + log_info("query for connection %lu received ping command", connection_id); net_send_ok(&net, connection_id, NULL); break; case COM_QUERY: { - log_info("query for connection %d : ----\n%s\n-------------------------", + log_info("query for connection %lu : ----\n%s\n-------------------------", connection_id,packet); if (Command *command= parse_command(&instance_map, packet)) { int res= 0; - log_info("query for connection %d successfully parsed",connection_id); + log_info("query for connection %lu successfully parsed",connection_id); res= command->execute(&net, connection_id); delete command; if (!res) - log_info("query for connection %d executed ok",connection_id); + log_info("query for connection %lu executed ok",connection_id); else { - log_info("query for connection %d executed err=%d",connection_id,res); + log_info("query for connection %lu executed err=%d",connection_id,res); net_send_error(&net, res); return 0; } @@ -358,7 +358,7 @@ break; } default: - log_info("query for connection %d received unknown command",connection_id); + log_info("query for connection %lu received unknown command",connection_id); net_send_error(&net, ER_UNKNOWN_COM_ERROR); break; } --- 1.155/sql/sql_repl.cc 2006-10-30 11:23:52 +01:00 +++ 1.156/sql/sql_repl.cc 2006-10-30 11:23:52 +01:00 @@ -1105,7 +1105,7 @@ { mi->master_log_pos= lex_mi->pos; } - DBUG_PRINT("info", ("master_log_pos: %d", (ulong) mi->master_log_pos)); + DBUG_PRINT("info", ("master_log_pos: %lu", (ulong) mi->master_log_pos)); if (lex_mi->host) strmake(mi->host, lex_mi->host, sizeof(mi->host)-1); @@ -1222,7 +1222,7 @@ } } mi->rli.group_master_log_pos = mi->master_log_pos; - DBUG_PRINT("info", ("master_log_pos: %d", (ulong) mi->master_log_pos)); + DBUG_PRINT("info", ("master_log_pos: %lu", (ulong) mi->master_log_pos)); /* Coordinates in rli were spoilt by the 'if (need_relay_log_purge)' block, --- 1.85/sql/ha_ndbcluster_binlog.cc 2006-10-30 11:23:52 +01:00 +++ 1.86/sql/ha_ndbcluster_binlog.cc 2006-10-30 11:23:52 +01:00 @@ -161,7 +161,7 @@ } DBUG_PRINT("info", ("%s: %s.%s s->fields: %d " - "reclength: %d rec_buff_length: %d record[0]: %p " + "reclength: %lu rec_buff_length: %d record[0]: %p " "record[1]: %p", info, table->s->db.str, @@ -176,7 +176,7 @@ { Field *f= table->field[i]; DBUG_PRINT("info", - ("[%d] \"%s\"(0x%lx:%s%s%s%s%s%s) type: %d pack_length: %d " + ("[%d] \"%s\"(0x%x:%s%s%s%s%s%s) type: %d pack_length: %d " "ptr: %p[+%d] null_bit: %u null_ptr: %p[+%d]", i, f->field_name, @@ -607,7 +607,7 @@ ("[%d] %p key: %s key_length: %d", i, share, share->key, share->key_length)); DBUG_PRINT("share", - ("db.tablename: %s.%s use_count: %d commit_count: %d", + ("db.tablename: %s.%s use_count: %d commit_count: %llu", share->db, share->table_name, share->use_count, share->commit_count)); } @@ -3514,7 +3514,7 @@ } } // now check that we have epochs consistant with what we had before the restart - DBUG_PRINT("info", ("schema_res: %d schema_gci: %d", schema_res, schema_gci)); + DBUG_PRINT("info", ("schema_res: %d schema_gci: %llu", schema_res, schema_gci)); { i_ndb->flushIncompleteEvents(schema_gci); s_ndb->flushIncompleteEvents(schema_gci); --- 1.40/vio/viossl.c 2006-10-30 11:23:52 +01:00 +++ 1.41/vio/viossl.c 2006-10-30 11:23:52 +01:00 @@ -128,7 +128,7 @@ break; /* Fallthrough */ default: /* Shutdown failed */ - DBUG_PRINT("vio_error", ("SSL_shutdown() failed, error: %s", + DBUG_PRINT("vio_error", ("SSL_shutdown() failed, error: %d", SSL_get_error(ssl, r))); break; } @@ -146,7 +146,7 @@ my_bool net_blocking; enum enum_vio_type old_type; DBUG_ENTER("sslaccept"); - DBUG_PRINT("enter", ("sd: %d ptr: %p, timeout: %d", + DBUG_PRINT("enter", ("sd: %d ptr: %p, timeout: %ld", vio->sd, ptr, timeout)); old_type= vio->type; --- 1.180/sql/sql_prepare.cc 2006-10-30 11:23:52 +01:00 +++ 1.181/sql/sql_prepare.cc 2006-10-30 11:23:52 +01:00 @@ -1665,7 +1665,7 @@ enum enum_sql_command sql_command= lex->sql_command; int res= 0; DBUG_ENTER("check_prepared_statement"); - DBUG_PRINT("enter",("command: %d, param_count: %ld", + DBUG_PRINT("enter",("command: %d, param_count: %u", sql_command, stmt->param_count)); lex->first_lists_tables_same();
| Thread | ||
|---|---|---|
| • bk commit into 5.1 tree (hartmut:1.2338) BUG#23748 | 'Hartmut Holzgraefe' | 30 Oct |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.899 sec. using MySQL 5.1.14-beta-log