summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-06-01 23:40:01 +0300
committerunknown <monty@narttu.mysql.fi>2003-06-01 23:40:01 +0300
commit3f7dfc4df3a9bdfc01e5b84c3297fff61b791f9b (patch)
tree3c4881fc77893b5cb3c764a11bac310e21a0ce77 /include
parent782da113cb6baab6e37daa94dc828e9f14111933 (diff)
downloadmariadb-git-3f7dfc4df3a9bdfc01e5b84c3297fff61b791f9b.tar.gz
Small fixes (nothing nameworthy)
mysql-test/r/errors.result: Rename: mysql-test/r/err000001.result -> mysql-test/r/errors.result include/my_global.h: typedef for future functions that needs string length as an argument innobase/os/os0file.c: Added operation to error messages mysql-test/t/errors.test: Cleaned up file to new error number standard mysys/thr_alarm.c: Made end_thr_alarm() work also with internal alarm thread. (Not critical for MySQL) sql/mysqld.cc: Added sigemptyset() (bug found by valgrind) Removed some wrong usage of thd when writing variable values
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h
index d892d843edc..90c4801e807 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -640,6 +640,9 @@ typedef long my_ptrdiff_t;
typedef long long my_ptrdiff_t;
#endif
+/* typedef used for length of string; Should be unsigned! */
+typedef ulong size_str;
+
#define MY_ALIGN(A,L) (((A) + (L) - 1) & ~((L) - 1))
#define ALIGN_SIZE(A) MY_ALIGN((A),sizeof(double))
/* Size to make adressable obj. */