From a3828081cde644ab551c21a621b8e6ab69923e6a Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Apr 2004 15:33:40 +0300 Subject: After merge fixes Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type' client/client_priv.h: Added option 'create_options' for mysqldump client/mysqldump.c: Changed '--all' to '--create-options' as the old name was meaningless innobase/buf/buf0buf.c: After merge fixes innobase/buf/buf0lru.c: After merge fixes innobase/buf/buf0rea.c: After merge fixes innobase/dict/dict0load.c: After merge fixes innobase/fil/fil0fil.c: After merge fixes innobase/ibuf/ibuf0ibuf.c: After merge fixes innobase/include/fil0fil.h: After merge fixes innobase/include/row0mysql.h: After merge fixes innobase/include/ut0mem.h: After merge fixes innobase/log/log0recv.c: After merge fixes innobase/row/row0mysql.c: After merge fixes innobase/row/row0sel.c: After merge fixes innobase/srv/srv0start.c: After merge fixes innobase/sync/sync0rw.c: After merge fixes innobase/sync/sync0sync.c: After merge fixes myisam/ft_boolean_search.c: After merge fixes myisam/ft_nlq_search.c: After merge fixes mysql-test/r/mysqldump.result: After merge fixes mysql-test/t/mysqldump.test: Make result file smaller Some new tests sql/ha_innodb.cc: After merge fixes sql/set_var.cc: Removed compiler warning sql/slave.cc: After merge fixes sql/slave.h: After merge fixes sql/sql_show.cc: Type -> Engine --- innobase/ibuf/ibuf0ibuf.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'innobase/ibuf') diff --git a/innobase/ibuf/ibuf0ibuf.c b/innobase/ibuf/ibuf0ibuf.c index 2973c9880ae..ecdcf08e4c6 100644 --- a/innobase/ibuf/ibuf0ibuf.c +++ b/innobase/ibuf/ibuf0ibuf.c @@ -332,9 +332,9 @@ ibuf_count_get( return(*(ibuf_counts[space] + page_no)); } -#ifdef UNIV_IBUF_DEBUG /********************************************************************** Sets the ibuf count for a given page. */ +#ifdef UNIV_IBUF_DEBUG static void ibuf_count_set( @@ -2710,17 +2710,17 @@ ibuf_insert_to_index_page( fprintf(stderr, "InnoDB: Trying to insert a record from the insert buffer to an index page\n" -"InnoDB: but the number of fields does not match!\n%s\n", errbuf); +"InnoDB: but the number of fields does not match!\n"); buf_page_print(page); - dtuple_sprintf(errbuf, 900, entry); + dtuple_print(stderr, entry); - fprintf(stderr, + fputs( "InnoDB: The table where where this index record belongs\n" "InnoDB: is now probably corrupt. Please run CHECK TABLE on\n" "InnoDB: your tables.\n" -"InnoDB: Send a detailed bug report to mysql@lists.mysql.com!\n"); +"InnoDB: Send a detailed bug report to mysql@lists.mysql.com!\n", stderr); return; } @@ -3386,13 +3386,17 @@ ibuf_print( (ulong) data->seg_size); if (data->empty) { - buf += sprintf(buf, " is empty\n"); + fputs(" is empty\n", file); } else { - buf += sprintf(buf, " is not empty\n"); + fputs(" is not empty\n", file); } fprintf(file, "Ibuf for space %lu: size %lu, free list len %lu, seg size %lu,\n" "%lu inserts, %lu merged recs, %lu merges\n", + (ulong) data->space, + (ulong) data->size, + (ulong) data->free_list_len, + (ulong) data->seg_size, (ulong) data->n_inserts, (ulong) data->n_merged_recs, (ulong) data->n_merges); -- cgit v1.2.1