summaryrefslogtreecommitdiff
path: root/include/m_string.h
diff options
context:
space:
mode:
authormonty@mysql.com/narttu.mysql.fi <>2007-10-11 18:07:40 +0300
committermonty@mysql.com/narttu.mysql.fi <>2007-10-11 18:07:40 +0300
commit7887babe69412b6f33f6cb782f468e9b58695fb9 (patch)
tree2f3bb6c8948945094ff740b1991e2d9b80a55ec3 /include/m_string.h
parent9473b90fd5c16a2043b70d869721e80b1d9916f7 (diff)
downloadmariadb-git-7887babe69412b6f33f6cb782f468e9b58695fb9.tar.gz
Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1
- Reserver namespace and place in frm for TABLE_CHECKSUM and PAGE_CHECKSUM create options - Added syncing of directory when creating .frm files - Portability fixes - Added missing cast that could cause bugs - Code cleanups - Made some bit functions inline - Moved things out of myisam.h to my_handler.h to make them more accessable - Renamed some myisam variables and defines to make them more globaly usable (as they are used outside of MyISAM) - Fixed bugs in error conditions - Use compiler time asserts instead of run time - Fixed indentation HA_EXTRA_PREPARE_FOR_DELETE -> HA_EXTRA_PREPARE_FOR_DROP as the old name was wrong (Added a define for old value to ensure we don't break any old code) Added HA_EXTRA_PREPARE_FOR_RENAME as a signal for rename (before we used a DROP signal which is wrong) - Initialize error messages early to get better errors when mysqld or an engine fails to start - Fix windows bug that query_performance_frequency was not initialized if registry code failed - thread_stack -> my_thread_stack_size
Diffstat (limited to 'include/m_string.h')
-rw-r--r--include/m_string.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/m_string.h b/include/m_string.h
index 00fb4cb0656..036eb8fe4d6 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -67,7 +67,7 @@
# define bcopy(s, d, n) memcpy((d), (s), (n))
# define bcmp(A,B,C) memcmp((A),(B),(C))
# define bzero(A,B) memset((A),0,(B))
-# define bmove_align(A,B,C) memcpy((A),(B),(C))
+# define bmove_align(A,B,C) memcpy((A),(B),(C))
#endif
#if defined(__cplusplus)
@@ -129,7 +129,10 @@ extern size_t bcmp(const uchar *s1,const uchar *s2,size_t len);
extern size_t my_bcmp(const uchar *s1,const uchar *s2,size_t len);
#undef bcmp
#define bcmp(A,B,C) my_bcmp((A),(B),(C))
-#endif
+#define bzero_if_purify(A,B) bzero(A,B)
+#else
+#define bzero_if_purify(A,B)
+#endif /* HAVE_purify */
#ifndef bmove512
extern void bmove512(uchar *dst,const uchar *src,size_t len);