summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-06-08 18:14:18 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-06-08 18:14:18 -0300
commit75a18e24fa72cca07254cbabd119b944c0ef989d (patch)
tree0699584297a9aa3c81ff88503dfb377f2d99610f /include
parente484e89d3df80e5a67f3eeac71e7c5ec1b081513 (diff)
parent51e90dc79e5b3847a8b1fdf69b8207864ff2f7c8 (diff)
downloadmariadb-git-75a18e24fa72cca07254cbabd119b944c0ef989d.tar.gz
Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
config/ac-macros/ssl.m4: Enable yaSSL thread safety if linking with the server or a thread safe client library. Avoids building a thread safe yaSSL when only building a non-thread safe client library.
Diffstat (limited to 'include')
-rw-r--r--include/my_sys.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index 4b26cbee8cd..3a240cfc118 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -50,7 +50,7 @@ extern int NEAR my_errno; /* Last error in mysys */
#define MYSYS_PROGRAM_USES_CURSES() { error_handler_hook = my_message_curses; mysys_uses_curses=1; }
#define MYSYS_PROGRAM_DONT_USE_CURSES() { error_handler_hook = my_message_no_curses; mysys_uses_curses=0;}
-#define MY_INIT(name); { my_progname= name; my_init(); }
+#define MY_INIT(name) { my_progname= name; my_init(); }
#define MY_FILE_ERROR ((size_t) -1)