diff options
| author | unknown <monty@mishka.local> | 2004-04-27 15:33:40 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2004-04-27 15:33:40 +0300 |
| commit | a3828081cde644ab551c21a621b8e6ab69923e6a (patch) | |
| tree | 4b29146428c84ab3e10e4007d26e3c0b4b2b1074 /innobase/buf/buf0buf.c | |
| parent | 1065f2bbd66ac4b1161f5c188171a54cbad5b422 (diff) | |
| download | mariadb-git-a3828081cde644ab551c21a621b8e6ab69923e6a.tar.gz | |
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
Diffstat (limited to 'innobase/buf/buf0buf.c')
| -rw-r--r-- | innobase/buf/buf0buf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c index d96bc7586e6..7a5ef3c5e14 100644 --- a/innobase/buf/buf0buf.c +++ b/innobase/buf/buf0buf.c @@ -1545,11 +1545,12 @@ buf_page_init( "InnoDB: Error: page %lu %lu already found from the hash table\n", (ulong) space, (ulong) offset); +#ifdef UNIV_DEBUG buf_print(); buf_LRU_print(); buf_validate(); buf_LRU_validate(); - +#endif /* UNIV_DEBUG */ ut_a(0); } @@ -2243,7 +2244,7 @@ buf_print_io( / time_elapsed); if (srv_use_awe) { - buf += sprintf(buf, "AWE: %.2f page remaps/s\n", + fprintf(file, "AWE: %.2f page remaps/s\n", (buf_pool->n_pages_awe_remapped - buf_pool->n_pages_awe_remapped_old) / time_elapsed); |