mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Added max_user_connections

Browse source 
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
This commit is contained in:
unknown 2001-02-20 22:34:47 +02:00
commit 62884b8f36
36 changed files with 175 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

3
innobase/configure.in
View file

@ -1,5 +1,6 @@
# Process this file with autoconf to produce a configure script
AC_INIT(./os/os0file.c)
AC_INIT
AM_MAINTAINER_MODE
AM_CONFIG_HEADER(ib_config.h)
AM_INIT_AUTOMAKE(ib, 0.90)
AC_PROG_CC

1
innobase/include/lock0types.h
View file

@ -9,6 +9,7 @@ Created 5/7/1996 Heikki Tuuri
#ifndef lock0types_h
#define lock0types_h
#define lock_t ib_lock_t
typedef struct lock_struct lock_t;
typedef struct lock_sys_struct lock_sys_t;

8
innobase/include/os0sync.h
View file

@ -25,8 +25,8 @@ struct os_event_struct {
fields */
ibool is_set; /* this is TRUE if the next mutex is
not reserved */
os_fast_mutex_t wait_mutex; /* this mutex is used in waiting for
the event */
pthread_cond_t cond_var; /* condition variable is used in
waiting for the event */
};
typedef struct os_event_struct os_event_struct_t;
typedef os_event_struct_t* os_event_t;
@ -190,9 +190,9 @@ os_fast_mutex_free(
/*===============*/
os_fast_mutex_t* fast_mutex); /* in: mutex to free */
#endif
#ifndef UNIV_NONINL
#include "os0sync.ic"
#endif
#endif
#endif

1
innobase/include/sync0types.h
View file

@ -9,6 +9,7 @@ Created 9/5/1995 Heikki Tuuri
#ifndef sync0types_h
#define sync0types_h
#define mutex_t ib_mutex_t
typedef struct mutex_struct mutex_t;

5
innobase/os/os0file.c
View file

@ -316,8 +316,11 @@ try_again:
UT_NOT_USED(purpose);
if (create_mode == OS_FILE_CREATE) {
#ifndef S_IRWXU
file = open(name, create_flag);
#else
file = open(name, create_flag, S_IRWXU | S_IRWXG | S_IRWXO);
#endif
} else {
file = open(name, create_flag);
}

16
innobase/srv/srv0start.c
View file

@ -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 */