From 7887babe69412b6f33f6cb782f468e9b58695fb9 Mon Sep 17 00:00:00 2001
From: "monty@mysql.com/narttu.mysql.fi" <>
Date: Thu, 11 Oct 2007 18:07:40 +0300
Subject: 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

---
 libmysql/Makefile.shared | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libmysql')

diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared
index 3a2559921f9..a4efd5b184f 100644
--- a/libmysql/Makefile.shared
+++ b/libmysql/Makefile.shared
@@ -68,7 +68,7 @@ mysysobjects1 =		my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
                         mf_iocache2.lo my_seek.lo my_sleep.lo \
 			my_pread.lo mf_cache.lo md5.lo sha1.lo \
 			my_getopt.lo my_gethostbyname.lo my_port.lo \
-                        my_rename.lo my_chsize.lo my_getsystime.lo
+                        my_rename.lo my_chsize.lo my_sync.lo my_getsystime.lo
 sqlobjects =		net.lo
 sql_cmn_objects =	pack.lo client.lo my_time.lo
 
-- 
cgit v1.2.1


From 1aa3b320757844f2036f99f99ddd1a9c77f56683 Mon Sep 17 00:00:00 2001
From: "jani@hynda.mysql.fi" <>
Date: Tue, 16 Oct 2007 17:59:16 +0300
Subject: Fixes to merge between 5.1-main and 5.1-marvel

---
 libmysql/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libmysql')

diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
index 8471bbbd76c..6094390b2e7 100755
--- a/libmysql/CMakeLists.txt
+++ b/libmysql/CMakeLists.txt
@@ -98,7 +98,7 @@ SET(CLIENT_SOURCES   ../mysys/array.c ../strings/bchange.c ../strings/bmove.c
                      ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c 
                      ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c 
                      ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c
-		     ../mysys/my_getsystime.c ${LIB_SOURCES})
+		     ../mysys/my_getsystime.c ../mysys/my_sync.c ${LIB_SOURCES})
 
 # Need to set USE_TLS for building the DLL, since __declspec(thread)
 # approach to thread local storage does not work properly in DLLs.
-- 
cgit v1.2.1