diff options
author | unknown <monty@donna.mysql.com> | 2000-09-07 04:55:17 +0300 |
---|---|---|
committer | unknown <monty@donna.mysql.com> | 2000-09-07 04:55:17 +0300 |
commit | bee9933ab83729e6ca2f2826706b1ab5b985df87 (patch) | |
tree | cd775f59b4803ef23e407df9d47af3ae7b517a13 /include | |
parent | aaca0e3c6bd71a7b34fcb3a137ab1113a20dca1f (diff) | |
download | mariadb-git-bee9933ab83729e6ca2f2826706b1ab5b985df87.tar.gz |
Small bug fixes
support-files/mysql.server-sys5.sh:
Change mode to -rw-rw-r--
Docs/manual.texi:
Added information about BeOS, Access 2000, AIX and user links
client/mysql.cc:
Fixed SOURCE to work on windows
client/mysqldump.c:
Strip of white space
configure.in:
Fix for AIX
include/dbug.h:
Assert handling
include/my_pthread.h:
Ia64 needs more thread stack than other processors
include/my_sys.h:
More comments
myisam/mi_key.c:
Fixed wrong key length checks
mysql.proj:
update
mysys/charset.c:
Cleanup
mysys/mf_keycache.c:
Moved SEC_LINK to file that used it
mysys/my_static.h:
Moved SEC_LINK to file that used it
scripts/Makefile.am:
Fix for debian
scripts/mysql_install_db.sh:
Cleanup
sql/gen_lex_hash.cc:
Better values
sql/ha_berkeley.cc:
Fix of reading of unique key
sql/handler.cc:
Fix memory allocation bug
sql/mysqld.cc:
Fix for Ia64
sql/share/charsets/latin1.conf:
Fixed sortorder back to scandinavian.
sql/sql_yacc.yy:
FULL shouldn't be a keyword
support-files/Makefile.am:
Fix for debian
support-files/mysql.server.sh:
Cleanups
Diffstat (limited to 'include')
-rw-r--r-- | include/dbug.h | 2 | ||||
-rw-r--r-- | include/my_pthread.h | 5 | ||||
-rw-r--r-- | include/my_sys.h | 11 |
3 files changed, 15 insertions, 3 deletions
diff --git a/include/dbug.h b/include/dbug.h index de6bbc66ed7..d86b83f4de8 100644 --- a/include/dbug.h +++ b/include/dbug.h @@ -66,6 +66,7 @@ extern void _db_unlock_file(); #define DEBUGGER_ON _no_db_=0 #define DBUG_LOCK_FILE { _db_lock_file(); } #define DBUG_UNLOCK_FILE { _db_unlock_file(); } +#define DBUG_ASSERT(A) A #else /* No debugger */ #define DBUG_ENTER(a1) @@ -85,6 +86,7 @@ extern void _db_unlock_file(); #define DEBUGGER_ON #define DBUG_LOCK_FILE #define DBUG_UNLOCK_FILE +#define DBUG_ASSERT(A) {} #endif #ifdef __cplusplus } diff --git a/include/my_pthread.h b/include/my_pthread.h index 19c39d76ef3..4adcc958590 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -490,6 +490,11 @@ extern int pthread_dummy(int); /* All thread specific variables are in the following struct */ #define THREAD_NAME_SIZE 10 +#if defined(__ia64__) +#define DEFAULT_THREAD_STACK (128*1024) +#else +#define DEFAULT_THREAD_STACK (64*1024) +#endif struct st_my_thread_var { diff --git a/include/my_sys.h b/include/my_sys.h index 57734e9e534..01f42e9878d 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -313,9 +313,13 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *); ((info)->rc_pos - (info)->rc_request_pos)) typedef struct st_changeable_var { - const char *name; - long *varptr; - long def_value,min_value,max_value,sub_size,block_size; + const char *name; /* Name of variable */ + long *varptr; /* Pointer to variable */ + long def_value, /* Default value */ + min_value, /* Min allowed value */ + max_value, /* Max allowed value */ + sub_size, /* Subtract this from given value */ + block_size; /* Value should be a mult. of this */ } CHANGEABLE_VAR; @@ -527,6 +531,7 @@ extern void my_free_lock(byte *ptr,myf flags); #define my_malloc_lock(A,B) my_malloc((A),(B)) #define my_free_lock(A,B) my_free((A),(B)) #endif +#define alloc_root_inited(A) ((A)->min_malloc != 0) void init_alloc_root(MEM_ROOT *mem_root,uint block_size); gptr alloc_root(MEM_ROOT *mem_root,unsigned int Size); void free_root(MEM_ROOT *root); |