diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-20 22:34:47 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-20 22:34:47 +0200 |
| commit | 62884b8f36e2bdb7dffd43fe65b7ac17025e6abe (patch) | |
| tree | f87e7ff2aa4e7016660a9275fe538c9ce99b6dfe /innobase/srv | |
| parent | dc7eafea57a321c92716b5b84c574a0347ade74f (diff) | |
| download | mariadb-git-62884b8f36e2bdb7dffd43fe65b7ac17025e6abe.tar.gz | |
Added max_user_connections
Fixes for Innobase
Don't reset whole to-buffer in strxnmov
BUILD/compile-pentium-debug:
Added innobase
include/mysqld_error.h:
New error messages
innobase/configure.in:
Update from heikki
innobase/include/lock0types.h:
Update from heikki
innobase/include/os0sync.h:
Update from heikki
innobase/include/sync0types.h:
Update from heikki
innobase/os/os0file.c:
Update from heikki
innobase/srv/srv0start.c:
Update from heikki
sql/ha_innobase.cc:
Update from Heikki
Changed assert -> dbug_assert
Changed return -> DBUG_RETURN
sql/mysql_priv.h:
Added max_user_connections
sql/mysqld.cc:
Added max_user_connections
sql/share/czech/errmsg.txt:
Added max_user_connections
sql/share/danish/errmsg.txt:
Added max_user_connections
sql/share/dutch/errmsg.txt:
Added max_user_connections
sql/share/english/errmsg.txt:
Added max_user_connections
sql/share/estonian/errmsg.txt:
Added max_user_connections
sql/share/french/errmsg.txt:
Added max_user_connections
sql/share/german/errmsg.txt:
Added max_user_connections
sql/share/greek/errmsg.txt:
Added max_user_connections
sql/share/hungarian/errmsg.txt:
Added max_user_connections
sql/share/italian/errmsg.txt:
Added max_user_connections
sql/share/japanese/errmsg.txt:
Added max_user_connections
sql/share/korean/errmsg.txt:
Added max_user_connections
sql/share/norwegian-ny/errmsg.txt:
Added max_user_connections
sql/share/norwegian/errmsg.txt:
Added max_user_connections
sql/share/polish/errmsg.txt:
Added max_user_connections
sql/share/portuguese/errmsg.txt:
Added max_user_connections
sql/share/romanian/errmsg.txt:
Added max_user_connections
sql/share/russian/errmsg.txt:
Added max_user_connections
sql/share/slovak/errmsg.txt:
Added max_user_connections
sql/share/spanish/errmsg.txt:
Added max_user_connections
sql/share/swedish/errmsg.OLD:
Added max_user_connections
sql/share/swedish/errmsg.txt:
Added max_user_connections
sql/sql_class.h:
cleanup
strings/str_test.c:
Added tests for strxnmov
strings/strxnmov.c:
Don't reset whole to buffer
Diffstat (limited to 'innobase/srv')
| -rw-r--r-- | innobase/srv/srv0start.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/innobase/srv/srv0start.c b/innobase/srv/srv0start.c index f627e5d6aa5..a3e94b63e37 100644 --- a/innobase/srv/srv0start.c +++ b/innobase/srv/srv0start.c @@ -56,6 +56,9 @@ Created 2/16/1996 Heikki Tuuri #include "srv0start.h" #include "que0que.h" +ibool srv_is_being_started = FALSE; +ibool srv_was_started = FALSE; + ibool measure_cont = FALSE; os_file_t files[1000]; @@ -443,6 +446,8 @@ innobase_start_or_create_for_mysql(void) log_do_write = TRUE; /* yydebug = TRUE; */ + srv_is_being_started = TRUE; + os_aio_use_native_aio = srv_use_native_aio; err = srv_boot(); @@ -676,6 +681,9 @@ innobase_start_or_create_for_mysql(void) thread_ids + 2 + SRV_MAX_N_IO_THREADS); fprintf(stderr, "Innobase: Started\n"); + srv_was_started = TRUE; + srv_is_being_started = FALSE; + sync_order_checks_on = TRUE; /* buf_debug_prints = TRUE; */ @@ -691,6 +699,14 @@ innobase_shutdown_for_mysql(void) /*=============================*/ /* out: DB_SUCCESS or error code */ { + if (!srv_was_started) { + if (srv_is_being_started) { + fprintf(stderr, + "Innobase: Warning: shutting down not properly started database\n"); + } + return(DB_SUCCESS); + } + /* Flush buffer pool to disk, write the current lsn to the tablespace header(s), and copy all log data to archive */ |