head 1.7; access; symbols; locks; strict; comment @# @; 1.7 date 2009.01.21.07.11.59; author rse; state Exp; branches; next 1.6; commitid ff8CZSJqaVJtRhzt; 1.6 date 2008.08.20.07.40.19; author rse; state Exp; branches; next 1.5; commitid oqCCHAFiMZr6Yuft; 1.5 date 2008.06.28.07.39.03; author rse; state Exp; branches; next 1.4; commitid KRYsG3MXB0jiFG8t; 1.4 date 2008.03.08.08.33.18; author rse; state Exp; branches; next 1.3; commitid 2IsjPVaSkCf6ziUs; 1.3 date 2007.11.23.17.13.26; author cs; state Exp; branches; next 1.2; commitid Nmm0fVWjoTeNQIGs; 1.2 date 2007.09.05.07.26.10; author rse; state Exp; branches; next 1.1; commitid VgVt133cKYxL8wws; 1.1 date 2007.05.20.20.31.01; author rse; state Exp; branches; next ; commitid 7Ca4uidDFTAfXHis; desc @@ 1.7 log @upgrading package: mysql6 6.0.8 -> 6.0.9 @ text @Index: include/Makefile.in --- include/Makefile.in.orig 2009-01-02 16:59:11 +0100 +++ include/Makefile.in 2009-01-20 23:36:32 +0100 @@@@ -406,14 +406,14 @@@@ my_getopt.h sslopt-longopts.h my_dir.h \ sslopt-vars.h sslopt-case.h sql_common.h keycache.h \ m_ctype.h my_attribute.h $(HEADERS_GEN_CONFIGURE) \ - $(HEADERS_GEN_MAKE) + rijndael.h sha1.h sha2.h my_aes.h $(HEADERS_GEN_MAKE) noinst_HEADERS = config-win.h config-netware.h lf.h my_bit.h \ heap.h maria.h myisamchk.h my_bitmap.h my_uctype.h \ myisam.h myisampack.h myisammrg.h ft_global.h\ mysys_err.h my_base.h help_start.h help_end.h \ - my_nosys.h my_alarm.h queues.h rijndael.h sha1.h sha2.h \ - my_aes.h my_tree.h my_trie.h hash.h thr_alarm.h \ + my_nosys.h my_alarm.h queues.h \ + my_tree.h my_trie.h hash.h thr_alarm.h \ thr_lock.h t_ctype.h violite.h my_md5.h base64.h \ my_handler.h my_time.h \ my_vle.h my_user.h my_atomic.h atomic/nolock.h \ Index: sql/Makefile.in --- sql/Makefile.in.orig 2009-01-02 16:59:18 +0100 +++ sql/Makefile.in 2009-01-20 23:19:54 +0100 @@@@ -595,7 +595,7 @@@@ $(top_builddir)/strings/libmystringslt.la mysqld_DEPENDENCIES = @@mysql_plugin_libs@@ $(SUPPORTING_LIBS) backup/libbackup.la libndb.la -LDADD = $(SUPPORTING_LIBS) @@ZLIB_LIBS@@ @@NDB_SCI_LIBS@@ +LDADD = $(SUPPORTING_LIBS) mysqld_LDADD = libndb.la \ @@MYSQLD_EXTRA_LDFLAGS@@ \ @@pstack_libs@@ $(libevent_libs) \ Index: storage/falcon/BigInt.cpp --- storage/falcon/BigInt.cpp.orig 2009-01-02 16:50:16 +0100 +++ storage/falcon/BigInt.cpp 2009-01-20 23:19:54 +0100 @@@@ -18,11 +18,7 @@@@ ////////////////////////////////////////////////////////////////////// #include -#if defined(__APPLE__) || defined(__FreeBSD__) #include -#else -#include -#endif #include #include "Engine.h" #include "BigInt.h" Index: storage/falcon/Configuration.cpp --- storage/falcon/Configuration.cpp.orig 2009-01-02 16:50:17 +0100 +++ storage/falcon/Configuration.cpp 2009-01-20 23:19:54 +0100 @@@@ -350,7 +350,7 @@@@ availableMemory = (uint64) availableMem; totalMemory = (uint64) physMem; -#else +#elif defined(__linux__) int64 pageSize = (int64)sysconf(_SC_PAGESIZE); int64 physPages = (int64)sysconf(_SC_PHYS_PAGES); int64 avPhysPages = (int64)sysconf(_SC_AVPHYS_PAGES); Index: storage/falcon/MemMgr.cpp --- storage/falcon/MemMgr.cpp.orig 2009-01-02 16:50:21 +0100 +++ storage/falcon/MemMgr.cpp 2009-01-20 23:19:54 +0100 @@@@ -20,12 +20,7 @@@@ #include #include -#if defined(__APPLE__) || defined(__FreeBSD__) #include -#else -#include -#endif -#include #include "Engine.h" #include "MemMgr.h" #include "Sync.h" Index: storage/falcon/Stream.cpp --- storage/falcon/Stream.cpp.orig 2009-01-02 16:50:29 +0100 +++ storage/falcon/Stream.cpp 2009-01-20 23:19:54 +0100 @@@@ -19,11 +19,7 @@@@ #include #include -#if defined(__APPLE__) || defined(__FreeBSD__) #include -#else -#include -#endif #include #include #include "Engine.h" @ 1.6 log @upgrading package: mysql6 6.0.5 -> 6.0.6 @ text @d2 3 a4 4 --- include/Makefile.in.orig 2008-08-12 17:34:35 +0200 +++ include/Makefile.in 2008-08-20 09:13:58 +0200 @@@@ -420,14 +420,14 @@@@ decimal.h errmsg.h my_global.h my_net.h \ d7 3 a9 2 - m_ctype.h my_attribute.h $(HEADERS_GEN) + m_ctype.h my_attribute.h rijndael.h sha1.h sha2.h my_aes.h $(HEADERS_GEN) d20 1 a20 1 mysql_version.h.in my_handler.h my_time.h \ d23 4 a26 4 --- sql/Makefile.in.orig 2008-08-12 17:34:43 +0200 +++ sql/Makefile.in 2008-08-20 09:11:29 +0200 @@@@ -586,7 +586,7 @@@@ $(top_builddir)/strings/libmystrings.a d35 2 a36 2 --- storage/falcon/BigInt.cpp.orig 2008-08-12 17:31:49 +0200 +++ storage/falcon/BigInt.cpp 2008-08-20 09:11:29 +0200 d50 3 a52 3 --- storage/falcon/Configuration.cpp.orig 2008-08-12 17:31:50 +0200 +++ storage/falcon/Configuration.cpp 2008-08-20 09:11:29 +0200 @@@@ -368,7 +368,7 @@@@ d62 2 a63 2 --- storage/falcon/MemMgr.cpp.orig 2008-08-12 17:31:51 +0200 +++ storage/falcon/MemMgr.cpp 2008-08-20 09:11:29 +0200 d78 2 a79 2 --- storage/falcon/Stream.cpp.orig 2008-08-12 17:31:53 +0200 +++ storage/falcon/Stream.cpp 2008-08-20 09:11:29 +0200 @ 1.5 log @upgrading package: mysql6 6.0.4 -> 6.0.5 @ text @d2 3 a4 3 --- include/Makefile.in.orig 2008-06-12 15:26:26 +0200 +++ include/Makefile.in 2008-06-27 23:27:03 +0200 @@@@ -416,14 +416,14 @@@@ d12 1 a12 1 heap.h my_bitmap.h my_uctype.h \ d23 3 a25 3 --- sql/Makefile.in.orig 2008-06-12 15:26:33 +0200 +++ sql/Makefile.in 2008-06-27 23:31:21 +0200 @@@@ -579,7 +579,7 @@@@ d35 2 a36 2 --- storage/falcon/BigInt.cpp.orig 2008-06-12 15:24:42 +0200 +++ storage/falcon/BigInt.cpp 2008-06-27 23:27:03 +0200 d50 3 a52 3 --- storage/falcon/Configuration.cpp.orig 2008-06-12 15:24:40 +0200 +++ storage/falcon/Configuration.cpp 2008-06-27 23:27:03 +0200 @@@@ -367,7 +367,7 @@@@ d62 2 a63 2 --- storage/falcon/MemMgr.cpp.orig 2008-06-12 15:24:29 +0200 +++ storage/falcon/MemMgr.cpp 2008-06-27 23:27:03 +0200 d78 2 a79 2 --- storage/falcon/Stream.cpp.orig 2008-06-12 15:24:28 +0200 +++ storage/falcon/Stream.cpp 2008-06-27 23:27:03 +0200 @ 1.4 log @upgrading package: mysql6 6.0.3 -> 6.0.4 @ text @d2 3 a4 3 --- include/Makefile.in.orig 2008-02-13 13:08:18 +0100 +++ include/Makefile.in 2008-03-08 09:09:34 +0100 @@@@ -413,14 +413,14 @@@@ d23 3 a25 3 --- sql/Makefile.in.orig 2008-02-13 13:08:25 +0100 +++ sql/Makefile.in 2008-03-08 09:02:38 +0100 @@@@ -572,7 +572,7 @@@@ d28 1 a28 1 mysqld_DEPENDENCIES = @@mysql_plugin_libs@@ $(SUPPORTING_LIBS) libndb.la d35 2 a36 2 --- storage/falcon/BigInt.cpp.orig 2008-02-13 13:06:54 +0100 +++ storage/falcon/BigInt.cpp 2008-03-08 09:02:38 +0100 d50 3 a52 3 --- storage/falcon/Configuration.cpp.orig 2008-02-13 13:06:37 +0100 +++ storage/falcon/Configuration.cpp 2008-03-08 09:10:32 +0100 @@@@ -360,7 +360,7 @@@@ d62 2 a63 2 --- storage/falcon/MemMgr.cpp.orig 2008-02-13 13:06:34 +0100 +++ storage/falcon/MemMgr.cpp 2008-03-08 09:13:09 +0100 d78 2 a79 2 --- storage/falcon/Stream.cpp.orig 2008-02-13 13:06:20 +0100 +++ storage/falcon/Stream.cpp 2008-03-08 09:02:38 +0100 @ 1.3 log @upgrading package: mysql6 6.0.2 -> 6.0.3 @ text @d2 3 a4 3 --- include/Makefile.in.orig 2007-11-19 11:37:37 +0100 +++ include/Makefile.in 2007-11-23 11:40:45 +0100 @@@@ -396,14 +396,14 @@@@ d9 1 a9 1 + m_ctype.h my_attribute.h rijndael.h sha1.h my_aes.h $(HEADERS_GEN) d11 1 a11 1 noinst_HEADERS = config-win.h config-netware.h \ d15 1 a15 1 - my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \ d23 3 a25 3 --- sql/Makefile.in.orig 2007-11-19 11:37:46 +0100 +++ sql/Makefile.in 2007-11-23 11:41:34 +0100 @@@@ -515,7 +515,7 @@@@ d33 1 a33 1 @@pstack_libs@@ \ d35 2 a36 2 --- storage/falcon/BigInt.cpp.orig 2007-11-19 11:36:36 +0100 +++ storage/falcon/BigInt.cpp 2007-11-23 11:42:48 +0100 d50 5 a54 3 --- storage/falcon/Configuration.cpp.orig 2007-11-19 11:36:22 +0100 +++ storage/falcon/Configuration.cpp 2007-11-23 11:51:26 +0100 @@@@ -288,7 +288,7 @@@@ a55 2 availableMemory *= ONE_MB; */ d58 3 a60 3 int32 pageSize = sysconf(_SC_PAGESIZE); //int32 physPages = sysconf(_SC_PHYS_PAGES); int32 avPhysPages = sysconf(_SC_AVPHYS_PAGES); d62 3 a64 4 --- storage/falcon/MemMgr.cpp.orig 2007-11-19 11:36:04 +0100 +++ storage/falcon/MemMgr.cpp 2007-11-23 11:52:18 +0100 @@@@ -19,11 +19,7 @@@@ #endif d67 1 d73 1 a73 1 #include d76 1 d78 2 a79 2 --- storage/falcon/Stream.cpp.orig 2007-11-19 11:35:53 +0100 +++ storage/falcon/Stream.cpp 2007-11-23 15:30:14 +0100 @ 1.2 log @upgrading package: mysql6 6.0.0 -> 6.0.2 @ text @d2 3 a4 3 --- include/Makefile.in.orig 2007-08-29 20:03:49 +0200 +++ include/Makefile.in 2007-09-05 09:09:54 +0200 @@@@ -397,14 +397,14 @@@@ d8 2 a9 2 - m_ctype.h mysql/plugin.h my_attribute.h $(HEADERS_GEN) + m_ctype.h mysql/plugin.h my_attribute.h rijndael.h sha1.h my_aes.h $(HEADERS_GEN) d19 1 a19 1 thr_lock.h t_ctype.h violite.h md5.h base64.h \ a21 49 Index: include/my_global.h --- include/my_global.h.orig 2007-08-29 20:02:06 +0200 +++ include/my_global.h 2007-09-05 09:09:54 +0200 @@@@ -1485,4 +1485,11 @@@@ /* Length of decimal number represented by INT64. */ #define MY_INT64_NUM_DECIMAL_DIGITS 21 +#ifndef max +#define max(a,b) ((a) >= (b) ? (a) : (b)) +#endif +#ifndef min +#define min(a,b) ((a) <= (b) ? (a) : (b)) +#endif + #endif /* my_global_h */ Index: scripts/mysql_config.sh --- scripts/mysql_config.sh.orig 2007-08-29 20:01:48 +0200 +++ scripts/mysql_config.sh 2007-09-05 09:09:54 +0200 @@@@ -97,9 +97,9 @@@@ # Create options # We intentionally add a space to the beginning and end of lib strings, simplifies replace later -libs=" $ldflags -L$pkglibdir -lmysqlclient @@ZLIB_DEPS@@ @@NON_THREADED_LIBS@@" +libs=" $ldflags -L$pkglibdir -lmysqlclient -lmysys @@ZLIB_DEPS@@ @@NON_THREADED_LIBS@@" libs="$libs @@openssl_libs@@ @@STATIC_NSS_FLAGS@@ " -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @@ZLIB_DEPS@@ @@LIBS@@ @@openssl_libs@@ " +libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @@ZLIB_DEPS@@ @@LIBS@@ @@openssl_libs@@ " embedded_libs=" $ldflags -L$pkglibdir -lmysqld @@ZLIB_DEPS@@ @@LIBS@@ @@WRAPLIBS@@ @@innodb_system_libs@@ @@openssl_libs@@ " cflags="-I$pkgincludedir @@CFLAGS@@ " #note: end space! Index: scripts/mysql_system_tables_data.sql --- scripts/mysql_system_tables_data.sql.orig 2007-08-29 20:01:34 +0200 +++ scripts/mysql_system_tables_data.sql 2007-09-05 09:09:54 +0200 @@@@ -2,15 +2,6 @@@@ -- The inital data for system tables of MySQL Server -- --- Fill "db" table with default grants for anyone to --- access database 'test' and 'test_%' if "db" table didn't exist -CREATE TEMPORARY TABLE tmp_db LIKE db; -INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); -INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); -INSERT INTO db SELECT * FROM tmp_db WHERE @@had_db_table=0; -DROP TABLE tmp_db; - - -- Fill "users" table with default users allowing root access -- from local machine if "users" table didn't exist before CREATE TEMPORARY TABLE tmp_user LIKE user; d23 3 a25 3 --- sql/Makefile.in.orig 2007-08-29 20:04:10 +0200 +++ sql/Makefile.in 2007-09-05 09:09:54 +0200 @@@@ -505,7 +505,7 @@@@ d28 1 a28 1 mysqld_DEPENDENCIES = @@mysql_plugin_libs@@ $(SUPPORTING_LIBS) d31 2 a32 1 mysqld_LDADD = @@MYSQLD_EXTRA_LDFLAGS@@ \ a33 1 @@mysql_plugin_libs@@ \ d35 2 a36 2 --- storage/falcon/BigInt.cpp.orig 2007-08-29 20:02:03 +0200 +++ storage/falcon/BigInt.cpp 2007-09-05 09:09:54 +0200 d41 3 a43 1 -#ifndef __APPLE__ a44 2 -#else #include d50 5 a54 5 --- storage/falcon/Configuration.cpp.orig 2007-08-29 20:02:03 +0200 +++ storage/falcon/Configuration.cpp 2007-09-05 09:09:54 +0200 @@@@ -287,7 +287,7 @@@@ availableMemory *= ONE_MB; a60 14 Index: storage/falcon/DateTime.cpp --- storage/falcon/DateTime.cpp.orig 2007-08-29 20:01:21 +0200 +++ storage/falcon/DateTime.cpp 2007-09-05 09:09:54 +0200 @@@@ -924,8 +924,10 @@@@ bool DateTime::isDayLightSavings(tm *time) { +#if 0 if (!daylight) return false; +#endif // Jan to March and November and December are definitely no d62 2 a63 2 --- storage/falcon/MemMgr.cpp.orig 2007-08-29 20:01:52 +0200 +++ storage/falcon/MemMgr.cpp 2007-09-05 09:09:54 +0200 d68 3 a70 1 -#ifndef __APPLE__ a71 2 -#else #include d77 2 a78 2 --- storage/falcon/Stream.cpp.orig 2007-08-29 20:02:19 +0200 +++ storage/falcon/Stream.cpp 2007-09-05 09:09:54 +0200 d83 3 a85 1 -#ifndef __APPLE__ a86 2 -#else #include @ 1.1 log @quick packaging of MySQL 6.0.0 ALPHA to allow playing with the new Falcon storage engine @ text @d2 4 a5 4 --- include/Makefile.in.orig 2007-04-26 22:28:24 +0200 +++ include/Makefile.in 2007-05-20 20:03:20 +0200 @@@@ -398,14 +398,14 @@@@ errmsg.h my_global.h my_net.h \ d8 2 a9 2 - m_ctype.h mysql/plugin.h $(HEADERS_GEN) + m_ctype.h mysql/plugin.h rijndael.h sha1.h my_aes.h $(HEADERS_GEN) d20 1 a20 1 mysql_version.h.in my_handler.h my_time.h decimal.h \ d23 3 a25 3 --- include/my_global.h.orig 2007-04-26 22:26:39 +0200 +++ include/my_global.h 2007-05-20 20:03:20 +0200 @@@@ -1515,4 +1515,11 @@@@ d38 2 a39 2 --- scripts/mysql_config.sh.orig 2007-04-26 22:26:26 +0200 +++ scripts/mysql_config.sh 2007-05-20 20:03:20 +0200 d53 3 a55 3 --- scripts/mysql_system_tables_data.sql.orig 2007-04-26 22:26:12 +0200 +++ scripts/mysql_system_tables_data.sql 2007-05-20 20:03:20 +0200 @@@@ -2,10 +2,6 @@@@ d59 7 a65 3 --- default grants for anyone to access database 'test' and 'test_%' -INSERT INTO db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); -INSERT INTO db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); d67 4 a70 3 -- default users allowing root access from local machine INSERT INTO user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0); REPLACE INTO user VALUES (@@@@hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0); d72 3 a74 3 --- sql/Makefile.in.orig 2007-04-26 22:28:43 +0200 +++ sql/Makefile.in 2007-05-20 20:03:20 +0200 @@@@ -507,7 +507,7 @@@@ d78 1 a78 1 -LDADD = $(SUPPORTING_LIBS) @@ZLIB_LIBS@@ d83 27 d111 2 a112 2 --- storage/falcon/DateTime.cpp.orig 2007-04-26 22:26:07 +0200 +++ storage/falcon/DateTime.cpp 2007-05-20 20:57:04 +0200 a123 41 Index: storage/falcon/MACAddress.cpp --- storage/falcon/MACAddress.cpp.orig 2007-04-26 22:26:06 +0200 +++ storage/falcon/MACAddress.cpp 2007-05-20 21:36:05 +0200 @@@@ -25,11 +25,16 @@@@ #else #include -#include +#include +#include #include +#include #include #endif +#include +#include + #include #include #include "Engine.h" @@@@ -83,7 +88,7 @@@@ if (length > 0 && length <= 8) macAddresses [count++] = getAddress (length, ifTable->table[n].bPhysAddr); } -#else +#elif defined(__linux__) int fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_IP); if (fd < 0) @@@@ -99,6 +104,10 @@@@ } close (fd); +#else + UCHAR mac[6]; + if (my_gethwaddr(mac) == 0) + macAddresses[count++] = getAddress(6, (UCHAR *)mac); #endif return count; d125 3 a127 3 --- storage/falcon/MemMgr.cpp.orig 2007-04-26 22:26:29 +0200 +++ storage/falcon/MemMgr.cpp 2007-05-20 21:36:46 +0200 @@@@ -19,7 +19,7 @@@@ d131 1 d133 3 a135 1 +#include d140 3 a142 3 --- storage/falcon/Stream.cpp.orig 2007-04-26 22:26:40 +0200 +++ storage/falcon/Stream.cpp 2007-05-20 22:03:41 +0200 @@@@ -19,7 +19,7 @@@@ d146 1 d148 3 a150 1 +#include a153 21 Index: storage/falcon/Thread.cpp --- storage/falcon/Thread.cpp.orig 2007-04-26 22:26:13 +0200 +++ storage/falcon/Thread.cpp 2007-05-20 22:08:44 +0200 @@@@ -244,7 +244,7 @@@@ #ifdef _PTHREADS if (!thread->threadId) - thread->threadId = pthread_self(); + thread->threadId = (long unsigned int)pthread_self(); #endif return thread; @@@@ -335,7 +335,7 @@@@ pthread_attr_t attributes; pthread_attr_init(&attributes); pthread_attr_setdetachstate(&attributes, PTHREAD_CREATE_DETACHED); - int ret = pthread_create (&threadId, &attributes, thread, this); + int ret = pthread_create ((pthread **)&threadId, &attributes, thread, this); pthread_attr_destroy(&attributes); if (ret) @