diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-06-21 07:36:18 +0300 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-06-21 07:36:18 +0300 |
| commit | 2fb07495ed6aded3a3c9bdbd9456bbe692362bc2 (patch) | |
| tree | 767c26a535c75a55034463ff090808d95891c741 /innobase/srv | |
| parent | c2e9730818d9b4a3aa2c237085d3cd41e3001414 (diff) | |
| parent | 3236060592757ec84b4abcd9e617009dd68555e1 (diff) | |
| download | mariadb-git-2fb07495ed6aded3a3c9bdbd9456bbe692362bc2.tar.gz | |
Merge hundin.mysql.fi:/home/marko/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0-current
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'innobase/srv')
| -rw-r--r-- | innobase/srv/srv0start.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index 541b73b831d..7798e0c8e32 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -1040,7 +1040,9 @@ innobase_start_or_create_for_mysql(void) srv_start_has_been_called = TRUE; +#ifdef UNIV_DEBUG log_do_write = TRUE; +#endif /* UNIV_DEBUG */ /* yydebug = TRUE; */ srv_is_being_started = TRUE; @@ -1554,8 +1556,9 @@ NetWare. */ os_thread_create(&srv_master_thread, NULL, thread_ids + 1 + SRV_MAX_N_IO_THREADS); +#ifdef UNIV_DEBUG /* buf_debug_prints = TRUE; */ - +#endif /* UNIV_DEBUG */ sum_of_data_file_sizes = 0; for (i = 0; i < srv_n_data_files; i++) { |