Menu
▾
▴
SF.net SVN: frontierkernel: [1684] Frontier/vendor/MySQL/current
|
From: <cre...@us...> - 2007-06-17 03:54:54
|
Revision: 1684
http://svn.sourceforge.net/frontierkernel/?rev=1684&view=rev
Author: creecode
Date: 2007-06-16 20:54:56 -0700 (Sat, 16 Jun 2007)
Log Message:
-----------
v5.0.41 files
Modified Paths:
--------------
Frontier/vendor/MySQL/current/osx10.3-powerpc/include/config.h
Frontier/vendor/MySQL/current/osx10.3-powerpc/include/m_ctype.h
Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_config.h
Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_dbug.h
Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_global.h
Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_pthread.h
Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_time.h
Frontier/vendor/MySQL/current/osx10.3-powerpc/include/mysql.h
Frontier/vendor/MySQL/current/osx10.3-powerpc/include/mysql_version.h
Frontier/vendor/MySQL/current/osx10.3-powerpc/include/violite.h
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libdbug.a
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient.a
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient_r.a
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmystrings.a
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysys.a
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.a
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libz.a
Frontier/vendor/MySQL/current/osx10.4-i686/include/config.h
Frontier/vendor/MySQL/current/osx10.4-i686/include/m_ctype.h
Frontier/vendor/MySQL/current/osx10.4-i686/include/my_base.h
Frontier/vendor/MySQL/current/osx10.4-i686/include/my_config.h
Frontier/vendor/MySQL/current/osx10.4-i686/include/my_dbug.h
Frontier/vendor/MySQL/current/osx10.4-i686/include/my_pthread.h
Frontier/vendor/MySQL/current/osx10.4-i686/include/my_sys.h
Frontier/vendor/MySQL/current/osx10.4-i686/include/my_time.h
Frontier/vendor/MySQL/current/osx10.4-i686/include/mysql.h
Frontier/vendor/MySQL/current/osx10.4-i686/include/mysql_version.h
Frontier/vendor/MySQL/current/osx10.4-i686/include/violite.h
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libdbug.a
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient.a
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient_r.a
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmystrings.a
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysys.a
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.a
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libz.a
Frontier/vendor/MySQL/current/win32/include/config-win.h
Frontier/vendor/MySQL/current/win32/include/libmysql.def
Frontier/vendor/MySQL/current/win32/include/m_ctype.h
Frontier/vendor/MySQL/current/win32/include/my_dbug.h
Frontier/vendor/MySQL/current/win32/include/my_global.h
Frontier/vendor/MySQL/current/win32/include/my_pthread.h
Frontier/vendor/MySQL/current/win32/include/my_sys.h
Frontier/vendor/MySQL/current/win32/include/mysql.h
Frontier/vendor/MySQL/current/win32/include/mysql_version.h
Frontier/vendor/MySQL/current/win32/include/mysqld_ername.h
Frontier/vendor/MySQL/current/win32/include/mysqld_error.h
Frontier/vendor/MySQL/current/win32/lib/debug/libmysql.dll
Frontier/vendor/MySQL/current/win32/lib/debug/libmysql.lib
Frontier/vendor/MySQL/current/win32/lib/debug/mysqlclient.lib
Frontier/vendor/MySQL/current/win32/lib/debug/mysys.lib
Frontier/vendor/MySQL/current/win32/lib/debug/regex.lib
Frontier/vendor/MySQL/current/win32/lib/debug/strings.lib
Frontier/vendor/MySQL/current/win32/lib/debug/zlib.lib
Frontier/vendor/MySQL/current/win32/lib/opt/libmysql.dll
Frontier/vendor/MySQL/current/win32/lib/opt/libmysql.lib
Frontier/vendor/MySQL/current/win32/lib/opt/mysqlclient.lib
Frontier/vendor/MySQL/current/win32/lib/opt/mysys-nt.lib
Frontier/vendor/MySQL/current/win32/lib/opt/regex.lib
Frontier/vendor/MySQL/current/win32/lib/opt/strings.lib
Frontier/vendor/MySQL/current/win32/lib/opt/zlib.lib
Added Paths:
-----------
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient.15.0.0.dylib
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient.15.dylib
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient.dylib
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient_r.15.0.0.dylib
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient_r.15.dylib
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient_r.dylib
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.2.0.0.dylib
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.2.dylib
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.dylib
Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.la
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient.15.0.0.dylib
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient.15.dylib
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient.dylib
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient_r.15.0.0.dylib
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient_r.15.dylib
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient_r.dylib
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.2.0.0.dylib
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.2.dylib
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.dylib
Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.la
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/include/config.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.3-powerpc/include/config.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.3-powerpc/include/config.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -971,7 +971,7 @@
#define NDB_SHM_TRANSPORTER 1
/* NDB build version */
-#define NDB_VERSION_BUILD 37
+#define NDB_VERSION_BUILD 41
/* NDB major version */
#define NDB_VERSION_MAJOR 5
@@ -1084,6 +1084,9 @@
/* Should be client be thread safe */
#define THREAD_SAFE_CLIENT 1
+/* Define to 1 if time_t is unsigned */
+/* #undef TIME_T_UNSIGNED */
+
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME 1
@@ -1114,7 +1117,7 @@
/* #undef USE_PSTACK */
/* Version number of package */
-#define VERSION "5.0.37"
+#define VERSION "5.0.41"
/* sighandler type is void (*signal ()) (); */
#define VOID_SIGHANDLER 1
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/include/m_ctype.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.3-powerpc/include/m_ctype.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.3-powerpc/include/m_ctype.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -90,7 +90,7 @@
{
uint beg;
uint end;
- uint mblen;
+ uint mb_len;
} my_match_t;
enum my_lex_states
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_config.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_config.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_config.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -971,7 +971,7 @@
#define NDB_SHM_TRANSPORTER 1
/* NDB build version */
-#define NDB_VERSION_BUILD 37
+#define NDB_VERSION_BUILD 41
/* NDB major version */
#define NDB_VERSION_MAJOR 5
@@ -1084,6 +1084,9 @@
/* Should be client be thread safe */
#define THREAD_SAFE_CLIENT 1
+/* Define to 1 if time_t is unsigned */
+/* #undef TIME_T_UNSIGNED */
+
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME 1
@@ -1114,7 +1117,7 @@
/* #undef USE_PSTACK */
/* Version number of package */
-#define VERSION "5.0.37"
+#define VERSION "5.0.41"
/* sighandler type is void (*signal ()) (); */
#define VOID_SIGHANDLER 1
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_dbug.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_dbug.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_dbug.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -74,6 +74,7 @@
#define DBUG_ASSERT(A) assert(A)
#define DBUG_EXECUTE_IF(keyword,a1) \
do {if (_db_on_) {if (_db_strict_keyword_ (keyword)) { a1 }}} while(0)
+#define IF_DBUG(A) A
#else /* No debugger */
#define DBUG_ENTER(a1)
@@ -98,6 +99,7 @@
#define DBUG_OUTPUT(A)
#define DBUG_ASSERT(A) {}
#define DBUG_LEAVE
+#define IF_DBUG(A)
#endif
#ifdef __cplusplus
}
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_global.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_global.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_global.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -540,7 +540,7 @@
duplicate declaration of __cxa_pure_virtual, solved by declaring it a
weak symbol.
*/
-#ifdef USE_MYSYS_NEW
+#if defined(USE_MYSYS_NEW) && ! defined(DONT_DECLARE_CXA_PURE_VIRTUAL)
C_MODE_START
int __cxa_pure_virtual () __attribute__ ((weak));
C_MODE_END
@@ -846,6 +846,21 @@
#define ADD_TO_PTR(ptr,size,type) (type) ((byte*) (ptr)+size)
#define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((byte*) (A) - (byte*) (B))
+/*
+ Custom version of standard offsetof() macro which can be used to get
+ offsets of members in class for non-POD types (according to the current
+ version of C++ standard offsetof() macro can't be used in such cases and
+ attempt to do so causes warnings to be emitted, OTOH in many cases it is
+ still OK to assume that all instances of the class has the same offsets
+ for the same members).
+
+ This is temporary solution which should be removed once File_parser class
+ and related routines are refactored.
+*/
+
+#define my_offsetof(TYPE, MEMBER) \
+ ((size_t)((char *)&(((TYPE *)0x10)->MEMBER) - (char*)0x10))
+
#define NullS (char *) 0
/* Nowdays we do not support MessyDos */
#ifndef NEAR
@@ -1078,7 +1093,7 @@
*/
#define uint3korr(A) (long) (*((unsigned int *) (A)) & 0xFFFFFF)
#endif
-#define uint4korr(A) (*((unsigned long *) (A)))
+#define uint4korr(A) (*((uint32 *) (A)))
#define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\
(((uint32) ((uchar) (A)[1])) << 8) +\
(((uint32) ((uchar) (A)[2])) << 16) +\
@@ -1342,4 +1357,13 @@
#define NO_EMBEDDED_ACCESS_CHECKS
#endif
+
+/* Length of decimal number represented by INT32. */
+
+#define MY_INT32_NUM_DECIMAL_DIGITS 11
+
+/* Length of decimal number represented by INT64. */
+
+#define MY_INT64_NUM_DECIMAL_DIGITS 21
+
#endif /* my_global_h */
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_pthread.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_pthread.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_pthread.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -80,11 +80,17 @@
typedef struct {
uint32 waiting;
-#ifdef OS2
- HEV semaphore;
-#else
- HANDLE semaphore;
-#endif
+ CRITICAL_SECTION lock_waiting;
+
+ enum {
+ SIGNAL= 0,
+ BROADCAST= 1,
+ MAX_EVENTS= 2
+ } EVENTS;
+
+ HANDLE events[MAX_EVENTS];
+ HANDLE broadcast_block_event;
+
} pthread_cond_t;
typedef int pthread_mutexattr_t;
@@ -370,14 +376,14 @@
we want to make sure that no such flags are set.
*/
#if defined(HAVE_SIGACTION) && !defined(my_sigset)
-#define my_sigset(A,B) do { struct sigaction s; sigset_t set; int rc; \
- DBUG_ASSERT((A) != 0); \
- sigemptyset(&set); \
- s.sa_handler = (B); \
- s.sa_mask = set; \
- s.sa_flags = 0; \
- rc= sigaction((A), &s, (struct sigaction *) NULL);\
- DBUG_ASSERT(rc == 0); \
+#define my_sigset(A,B) do { struct sigaction l_s; sigset_t l_set; int l_rc; \
+ DBUG_ASSERT((A) != 0); \
+ sigemptyset(&l_set); \
+ l_s.sa_handler = (B); \
+ l_s.sa_mask = l_set; \
+ l_s.sa_flags = 0; \
+ l_rc= sigaction((A), &l_s, (struct sigaction *) NULL);\
+ DBUG_ASSERT(l_rc == 0); \
} while (0)
#elif defined(HAVE_SIGSET) && !defined(my_sigset)
#define my_sigset(A,B) sigset((A),(B))
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_time.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_time.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.3-powerpc/include/my_time.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -30,7 +30,13 @@
/*
Portable time_t replacement.
- Should be signed and hold seconds for 1902-2038 range.
+ Should be signed and hold seconds for 1902 -- 2038-01-19 range
+ i.e at least a 32bit variable
+
+ Using the system built in time_t is not an option as
+ we rely on the above requirements in the time functions
+
+ For example QNX has an unsigned time_t type
*/
typedef long my_time_t;
@@ -73,16 +79,16 @@
uint flags, int *was_cut);
longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
uint flags, int *was_cut);
-ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *time);
-ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *time);
-ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *time);
-ulonglong TIME_to_ulonglong(const MYSQL_TIME *time);
+ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *);
+ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *);
+ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *);
+ulonglong TIME_to_ulonglong(const MYSQL_TIME *);
my_bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time,
int *warning);
-int check_time_range(struct st_mysql_time *time, int *warning);
+int check_time_range(struct st_mysql_time *, int *warning);
long calc_daynr(uint year,uint month,uint day);
uint calc_days_in_year(uint year);
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/include/mysql.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.3-powerpc/include/mysql.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.3-powerpc/include/mysql.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -87,6 +87,7 @@
#define IS_NUM(t) ((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR || (t) == FIELD_TYPE_NEWDECIMAL)
#define IS_NUM_FIELD(f) ((f)->flags & NUM_FLAG)
#define INTERNAL_NUM_FIELD(f) (((f)->type <= FIELD_TYPE_INT24 && ((f)->type != FIELD_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == FIELD_TYPE_YEAR)
+#define IS_LONGDATA(t) ((t) >= MYSQL_TYPE_TINY_BLOB && (t) <= MYSQL_TYPE_STRING)
typedef struct st_mysql_field {
@@ -783,7 +784,7 @@
unsigned long length);
int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt);
int STDCALL mysql_stmt_fetch(MYSQL_STMT *stmt);
-int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind,
+int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind_arg,
unsigned int column,
unsigned long offset);
int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt);
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/include/mysql_version.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.3-powerpc/include/mysql_version.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.3-powerpc/include/mysql_version.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -9,11 +9,11 @@
#include <custom_conf.h>
#else
#define PROTOCOL_VERSION 10
-#define MYSQL_SERVER_VERSION "5.0.37"
+#define MYSQL_SERVER_VERSION "5.0.41"
#define MYSQL_BASE_VERSION "mysqld-5.0"
#define MYSQL_SERVER_SUFFIX_DEF ""
#define FRM_VER 6
-#define MYSQL_VERSION_ID 50037
+#define MYSQL_VERSION_ID 50041
#define MYSQL_PORT 3306
#define MYSQL_UNIX_ADDR "/tmp/mysql.sock"
#define MYSQL_CONFIG_NAME "my"
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/include/violite.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.3-powerpc/include/violite.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.3-powerpc/include/violite.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -102,6 +102,9 @@
#define HEADER_DES_LOCL_H dummy_something
#define YASSL_MYSQL_COMPATIBLE
#define YASSL_PREFIX
+/* Set yaSSL to use same type as MySQL do for socket handles */
+typedef my_socket YASSL_SOCKET_T;
+#define YASSL_SOCKET_T_DEFINED
#include <openssl/ssl.h>
#include <openssl/err.h>
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libdbug.a
===================================================================
(Binary files differ)
Added: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient.15.0.0.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient.15.0.0.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient.15.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient.15.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient.a
===================================================================
(Binary files differ)
Added: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient_r.15.0.0.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient_r.15.0.0.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient_r.15.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient_r.15.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient_r.a
===================================================================
(Binary files differ)
Added: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient_r.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysqlclient_r.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmystrings.a
===================================================================
(Binary files differ)
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libmysys.a
===================================================================
(Binary files differ)
Added: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.2.0.0.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.2.0.0.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.2.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.2.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.a
===================================================================
(Binary files differ)
Added: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.la
===================================================================
--- Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.la (rev 0)
+++ Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.la 2007-06-17 03:54:56 UTC (rev 1684)
@@ -0,0 +1,35 @@
+# libndbclient.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libndbclient.2.dylib'
+
+# Names of this library.
+library_names='libndbclient.2.0.0.dylib libndbclient.2.dylib libndbclient.dylib'
+
+# The name of the static archive.
+old_library='libndbclient.a'
+
+# Libraries that this one depends upon.
+dependency_libs=' -lm'
+
+# Version information for libndbclient.
+current=2
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/local/mysql/lib/mysql'
Property changes on: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libndbclient.la
___________________________________________________________________
Name: svn:executable
+ *
Modified: Frontier/vendor/MySQL/current/osx10.3-powerpc/lib/libz.a
===================================================================
(Binary files differ)
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/include/config.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/include/config.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/include/config.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -971,7 +971,7 @@
#define NDB_SHM_TRANSPORTER 1
/* NDB build version */
-#define NDB_VERSION_BUILD 37
+#define NDB_VERSION_BUILD 41
/* NDB major version */
#define NDB_VERSION_MAJOR 5
@@ -1084,6 +1084,9 @@
/* Should be client be thread safe */
#define THREAD_SAFE_CLIENT 1
+/* Define to 1 if time_t is unsigned */
+/* #undef TIME_T_UNSIGNED */
+
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME 1
@@ -1114,7 +1117,7 @@
/* #undef USE_PSTACK */
/* Version number of package */
-#define VERSION "5.0.37"
+#define VERSION "5.0.41"
/* sighandler type is void (*signal ()) (); */
#define VOID_SIGHANDLER 1
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/include/m_ctype.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/include/m_ctype.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/include/m_ctype.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -90,7 +90,7 @@
{
uint beg;
uint end;
- uint mblen;
+ uint mb_len;
} my_match_t;
enum my_lex_states
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/include/my_base.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/include/my_base.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/include/my_base.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -160,7 +160,15 @@
Off by default.
*/
HA_EXTRA_WRITE_CAN_REPLACE,
- HA_EXTRA_WRITE_CANNOT_REPLACE
+ HA_EXTRA_WRITE_CANNOT_REPLACE,
+ /*
+ Inform handler that delete_row()/update_row() cannot batch deletes/updates
+ and should perform them immediately. This may be needed when table has
+ AFTER DELETE/UPDATE triggers which access to subject table.
+ These flags are reset by the handler::extra(HA_EXTRA_RESET) call.
+ */
+ HA_EXTRA_DELETE_CANNOT_BATCH,
+ HA_EXTRA_UPDATE_CANNOT_BATCH
};
/* The following is parameter to ha_panic() */
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/include/my_config.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/include/my_config.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/include/my_config.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -971,7 +971,7 @@
#define NDB_SHM_TRANSPORTER 1
/* NDB build version */
-#define NDB_VERSION_BUILD 37
+#define NDB_VERSION_BUILD 41
/* NDB major version */
#define NDB_VERSION_MAJOR 5
@@ -1084,6 +1084,9 @@
/* Should be client be thread safe */
#define THREAD_SAFE_CLIENT 1
+/* Define to 1 if time_t is unsigned */
+/* #undef TIME_T_UNSIGNED */
+
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME 1
@@ -1114,7 +1117,7 @@
/* #undef USE_PSTACK */
/* Version number of package */
-#define VERSION "5.0.37"
+#define VERSION "5.0.41"
/* sighandler type is void (*signal ()) (); */
#define VOID_SIGHANDLER 1
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/include/my_dbug.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/include/my_dbug.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/include/my_dbug.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -74,6 +74,7 @@
#define DBUG_ASSERT(A) assert(A)
#define DBUG_EXECUTE_IF(keyword,a1) \
do {if (_db_on_) {if (_db_strict_keyword_ (keyword)) { a1 }}} while(0)
+#define IF_DBUG(A) A
#else /* No debugger */
#define DBUG_ENTER(a1)
@@ -98,6 +99,7 @@
#define DBUG_OUTPUT(A)
#define DBUG_ASSERT(A) {}
#define DBUG_LEAVE
+#define IF_DBUG(A)
#endif
#ifdef __cplusplus
}
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/include/my_pthread.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/include/my_pthread.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/include/my_pthread.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -80,11 +80,17 @@
typedef struct {
uint32 waiting;
-#ifdef OS2
- HEV semaphore;
-#else
- HANDLE semaphore;
-#endif
+ CRITICAL_SECTION lock_waiting;
+
+ enum {
+ SIGNAL= 0,
+ BROADCAST= 1,
+ MAX_EVENTS= 2
+ } EVENTS;
+
+ HANDLE events[MAX_EVENTS];
+ HANDLE broadcast_block_event;
+
} pthread_cond_t;
typedef int pthread_mutexattr_t;
@@ -370,14 +376,14 @@
we want to make sure that no such flags are set.
*/
#if defined(HAVE_SIGACTION) && !defined(my_sigset)
-#define my_sigset(A,B) do { struct sigaction s; sigset_t set; int rc; \
- DBUG_ASSERT((A) != 0); \
- sigemptyset(&set); \
- s.sa_handler = (B); \
- s.sa_mask = set; \
- s.sa_flags = 0; \
- rc= sigaction((A), &s, (struct sigaction *) NULL);\
- DBUG_ASSERT(rc == 0); \
+#define my_sigset(A,B) do { struct sigaction l_s; sigset_t l_set; int l_rc; \
+ DBUG_ASSERT((A) != 0); \
+ sigemptyset(&l_set); \
+ l_s.sa_handler = (B); \
+ l_s.sa_mask = l_set; \
+ l_s.sa_flags = 0; \
+ l_rc= sigaction((A), &l_s, (struct sigaction *) NULL);\
+ DBUG_ASSERT(l_rc == 0); \
} while (0)
#elif defined(HAVE_SIGSET) && !defined(my_sigset)
#define my_sigset(A,B) sigset((A),(B))
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/include/my_sys.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/include/my_sys.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/include/my_sys.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -260,9 +260,10 @@
NEAR my_disable_flush_key_blocks, NEAR my_disable_symlinks;
extern char wild_many,wild_one,wild_prefix;
extern const char *charsets_dir;
-extern char *defaults_extra_file;
-extern const char *defaults_group_suffix;
-extern const char *defaults_file;
+/* from default.c */
+extern char *my_defaults_extra_file;
+extern const char *my_defaults_group_suffix;
+extern const char *my_defaults_file;
extern my_bool timed_mutexes;
@@ -321,8 +322,17 @@
extern struct st_my_file_info *my_file_info;
+typedef struct st_dynamic_array
+{
+ char *buffer;
+ uint elements,max_element;
+ uint alloc_increment;
+ uint size_of_element;
+} DYNAMIC_ARRAY;
+
typedef struct st_my_tmpdir
{
+ DYNAMIC_ARRAY full_list;
char **list;
uint cur, max;
#ifdef THREAD
@@ -330,14 +340,6 @@
#endif
} MY_TMPDIR;
-typedef struct st_dynamic_array
-{
- char *buffer;
- uint elements,max_element;
- uint alloc_increment;
- uint size_of_element;
-} DYNAMIC_ARRAY;
-
typedef struct st_dynamic_string
{
char *str;
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/include/my_time.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/include/my_time.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/include/my_time.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -30,7 +30,13 @@
/*
Portable time_t replacement.
- Should be signed and hold seconds for 1902-2038 range.
+ Should be signed and hold seconds for 1902 -- 2038-01-19 range
+ i.e at least a 32bit variable
+
+ Using the system built in time_t is not an option as
+ we rely on the above requirements in the time functions
+
+ For example QNX has an unsigned time_t type
*/
typedef long my_time_t;
@@ -73,16 +79,16 @@
uint flags, int *was_cut);
longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
uint flags, int *was_cut);
-ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *time);
-ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *time);
-ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *time);
-ulonglong TIME_to_ulonglong(const MYSQL_TIME *time);
+ulonglong TIME_to_ulonglong_datetime(const MYSQL_TIME *);
+ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *);
+ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *);
+ulonglong TIME_to_ulonglong(const MYSQL_TIME *);
my_bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time,
int *warning);
-int check_time_range(struct st_mysql_time *time, int *warning);
+int check_time_range(struct st_mysql_time *, int *warning);
long calc_daynr(uint year,uint month,uint day);
uint calc_days_in_year(uint year);
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/include/mysql.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/include/mysql.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/include/mysql.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -87,6 +87,7 @@
#define IS_NUM(t) ((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR || (t) == FIELD_TYPE_NEWDECIMAL)
#define IS_NUM_FIELD(f) ((f)->flags & NUM_FLAG)
#define INTERNAL_NUM_FIELD(f) (((f)->type <= FIELD_TYPE_INT24 && ((f)->type != FIELD_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == FIELD_TYPE_YEAR)
+#define IS_LONGDATA(t) ((t) >= MYSQL_TYPE_TINY_BLOB && (t) <= MYSQL_TYPE_STRING)
typedef struct st_mysql_field {
@@ -783,7 +784,7 @@
unsigned long length);
int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt);
int STDCALL mysql_stmt_fetch(MYSQL_STMT *stmt);
-int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind,
+int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind_arg,
unsigned int column,
unsigned long offset);
int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt);
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/include/mysql_version.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/include/mysql_version.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/include/mysql_version.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -9,11 +9,11 @@
#include <custom_conf.h>
#else
#define PROTOCOL_VERSION 10
-#define MYSQL_SERVER_VERSION "5.0.37"
+#define MYSQL_SERVER_VERSION "5.0.41"
#define MYSQL_BASE_VERSION "mysqld-5.0"
#define MYSQL_SERVER_SUFFIX_DEF ""
#define FRM_VER 6
-#define MYSQL_VERSION_ID 50037
+#define MYSQL_VERSION_ID 50041
#define MYSQL_PORT 3306
#define MYSQL_UNIX_ADDR "/tmp/mysql.sock"
#define MYSQL_CONFIG_NAME "my"
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/include/violite.h
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/include/violite.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/include/violite.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -102,6 +102,9 @@
#define HEADER_DES_LOCL_H dummy_something
#define YASSL_MYSQL_COMPATIBLE
#define YASSL_PREFIX
+/* Set yaSSL to use same type as MySQL do for socket handles */
+typedef my_socket YASSL_SOCKET_T;
+#define YASSL_SOCKET_T_DEFINED
#include <openssl/ssl.h>
#include <openssl/err.h>
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libdbug.a
===================================================================
(Binary files differ)
Added: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient.15.0.0.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient.15.0.0.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient.15.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient.15.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient.a
===================================================================
(Binary files differ)
Added: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient_r.15.0.0.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient_r.15.0.0.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient_r.15.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient_r.15.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient_r.a
===================================================================
(Binary files differ)
Added: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient_r.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysqlclient_r.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmystrings.a
===================================================================
(Binary files differ)
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libmysys.a
===================================================================
(Binary files differ)
Added: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.2.0.0.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.2.0.0.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.2.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.2.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.a
===================================================================
(Binary files differ)
Added: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.dylib
===================================================================
(Binary files differ)
Property changes on: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.dylib
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.la
===================================================================
--- Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.la (rev 0)
+++ Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.la 2007-06-17 03:54:56 UTC (rev 1684)
@@ -0,0 +1,35 @@
+# libndbclient.la - a libtool library file
+# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='libndbclient.2.dylib'
+
+# Names of this library.
+library_names='libndbclient.2.0.0.dylib libndbclient.2.dylib libndbclient.dylib'
+
+# The name of the static archive.
+old_library='libndbclient.a'
+
+# Libraries that this one depends upon.
+dependency_libs=' -lm'
+
+# Version information for libndbclient.
+current=2
+age=0
+revision=0
+
+# Is this an already installed library?
+installed=yes
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=no
+
+# Files to dlopen/dlpreopen
+dlopen=''
+dlpreopen=''
+
+# Directory that this library needs to be installed in:
+libdir='/usr/local/mysql/lib/mysql'
Property changes on: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libndbclient.la
___________________________________________________________________
Name: svn:executable
+ *
Modified: Frontier/vendor/MySQL/current/osx10.4-i686/lib/libz.a
===================================================================
(Binary files differ)
Modified: Frontier/vendor/MySQL/current/win32/include/config-win.h
===================================================================
--- Frontier/vendor/MySQL/current/win32/include/config-win.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/win32/include/config-win.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -411,14 +411,8 @@
#define shared_memory_buffer_length 16000
#define default_shared_memory_base_name "MYSQL"
-#ifdef CYBOZU
-#define MYSQL_DEFAULT_CHARSET_NAME "utf8"
-#define MYSQL_DEFAULT_COLLATION_NAME "utf8_general_cs"
-#define HAVE_UTF8_GENERAL_CS 1
-#else
#define MYSQL_DEFAULT_CHARSET_NAME "latin1"
#define MYSQL_DEFAULT_COLLATION_NAME "latin1_swedish_ci"
-#endif
#define HAVE_SPATIAL 1
#define HAVE_RTREE_KEYS 1
@@ -429,10 +423,8 @@
/* Define charsets you want */
/* #undef HAVE_CHARSET_armscii8 */
/* #undef HAVE_CHARSET_ascii */
-#ifndef CYBOZU
#define HAVE_CHARSET_big5 1
#define HAVE_CHARSET_cp1250 1
-#endif
/* #undef HAVE_CHARSET_cp1251 */
/* #undef HAVE_CHARSET_cp1256 */
/* #undef HAVE_CHARSET_cp1257 */
@@ -441,33 +433,27 @@
/* #undef HAVE_CHARSET_cp866 */
#define HAVE_CHARSET_cp932 1
/* #undef HAVE_CHARSET_dec8 */
-#ifndef CYBOZU
#define HAVE_CHARSET_eucjpms 1
#define HAVE_CHARSET_euckr 1
#define HAVE_CHARSET_gb2312 1
#define HAVE_CHARSET_gbk 1
-#endif
/* #undef HAVE_CHARSET_greek */
/* #undef HAVE_CHARSET_hebrew */
/* #undef HAVE_CHARSET_hp8 */
/* #undef HAVE_CHARSET_keybcs2 */
/* #undef HAVE_CHARSET_koi8r */
/* #undef HAVE_CHARSET_koi8u */
-#ifndef CYBOZU
#define HAVE_CHARSET_latin1 1
#define HAVE_CHARSET_latin2 1
-#endif
/* #undef HAVE_CHARSET_latin5 */
/* #undef HAVE_CHARSET_latin7 */
/* #undef HAVE_CHARSET_macce */
/* #undef HAVE_CHARSET_macroman */
#define HAVE_CHARSET_sjis 1
/* #undef HAVE_CHARSET_swe7 */
-#ifndef CYBOZU
#define HAVE_CHARSET_tis620 1
#define HAVE_CHARSET_ucs2 1
#define HAVE_CHARSET_ujis 1
-#endif
#define HAVE_CHARSET_utf8 1
#define HAVE_UCA_COLLATIONS 1
Modified: Frontier/vendor/MySQL/current/win32/include/libmysql.def
===================================================================
--- Frontier/vendor/MySQL/current/win32/include/libmysql.def 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/win32/include/libmysql.def 2007-06-17 03:54:56 UTC (rev 1684)
@@ -1,5 +1,4 @@
LIBRARY LIBMYSQL
-DESCRIPTION 'MySQL 5.0 Client Library'
VERSION 6.0
EXPORTS
_dig_vec_lower
Modified: Frontier/vendor/MySQL/current/win32/include/m_ctype.h
===================================================================
--- Frontier/vendor/MySQL/current/win32/include/m_ctype.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/win32/include/m_ctype.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -90,7 +90,7 @@
{
uint beg;
uint end;
- uint mblen;
+ uint mb_len;
} my_match_t;
enum my_lex_states
Modified: Frontier/vendor/MySQL/current/win32/include/my_dbug.h
===================================================================
--- Frontier/vendor/MySQL/current/win32/include/my_dbug.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/win32/include/my_dbug.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -74,6 +74,7 @@
#define DBUG_ASSERT(A) assert(A)
#define DBUG_EXECUTE_IF(keyword,a1) \
do {if (_db_on_) {if (_db_strict_keyword_ (keyword)) { a1 }}} while(0)
+#define IF_DBUG(A) A
#else /* No debugger */
#define DBUG_ENTER(a1)
@@ -98,6 +99,7 @@
#define DBUG_OUTPUT(A)
#define DBUG_ASSERT(A) {}
#define DBUG_LEAVE
+#define IF_DBUG(A)
#endif
#ifdef __cplusplus
}
Modified: Frontier/vendor/MySQL/current/win32/include/my_global.h
===================================================================
--- Frontier/vendor/MySQL/current/win32/include/my_global.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/win32/include/my_global.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -540,7 +540,7 @@
duplicate declaration of __cxa_pure_virtual, solved by declaring it a
weak symbol.
*/
-#ifdef USE_MYSYS_NEW
+#if defined(USE_MYSYS_NEW) && ! defined(DONT_DECLARE_CXA_PURE_VIRTUAL)
C_MODE_START
int __cxa_pure_virtual () __attribute__ ((weak));
C_MODE_END
@@ -846,6 +846,21 @@
#define ADD_TO_PTR(ptr,size,type) (type) ((byte*) (ptr)+size)
#define PTR_BYTE_DIFF(A,B) (my_ptrdiff_t) ((byte*) (A) - (byte*) (B))
+/*
+ Custom version of standard offsetof() macro which can be used to get
+ offsets of members in class for non-POD types (according to the current
+ version of C++ standard offsetof() macro can't be used in such cases and
+ attempt to do so causes warnings to be emitted, OTOH in many cases it is
+ still OK to assume that all instances of the class has the same offsets
+ for the same members).
+
+ This is temporary solution which should be removed once File_parser class
+ and related routines are refactored.
+*/
+
+#define my_offsetof(TYPE, MEMBER) \
+ ((size_t)((char *)&(((TYPE *)0x10)->MEMBER) - (char*)0x10))
+
#define NullS (char *) 0
/* Nowdays we do not support MessyDos */
#ifndef NEAR
@@ -1078,7 +1093,7 @@
*/
#define uint3korr(A) (long) (*((unsigned int *) (A)) & 0xFFFFFF)
#endif
-#define uint4korr(A) (*((unsigned long *) (A)))
+#define uint4korr(A) (*((uint32 *) (A)))
#define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\
(((uint32) ((uchar) (A)[1])) << 8) +\
(((uint32) ((uchar) (A)[2])) << 16) +\
@@ -1342,4 +1357,13 @@
#define NO_EMBEDDED_ACCESS_CHECKS
#endif
+
+/* Length of decimal number represented by INT32. */
+
+#define MY_INT32_NUM_DECIMAL_DIGITS 11
+
+/* Length of decimal number represented by INT64. */
+
+#define MY_INT64_NUM_DECIMAL_DIGITS 21
+
#endif /* my_global_h */
Modified: Frontier/vendor/MySQL/current/win32/include/my_pthread.h
===================================================================
--- Frontier/vendor/MySQL/current/win32/include/my_pthread.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/win32/include/my_pthread.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -80,11 +80,17 @@
typedef struct {
uint32 waiting;
-#ifdef OS2
- HEV semaphore;
-#else
- HANDLE semaphore;
-#endif
+ CRITICAL_SECTION lock_waiting;
+
+ enum {
+ SIGNAL= 0,
+ BROADCAST= 1,
+ MAX_EVENTS= 2
+ } EVENTS;
+
+ HANDLE events[MAX_EVENTS];
+ HANDLE broadcast_block_event;
+
} pthread_cond_t;
typedef int pthread_mutexattr_t;
@@ -370,14 +376,14 @@
we want to make sure that no such flags are set.
*/
#if defined(HAVE_SIGACTION) && !defined(my_sigset)
-#define my_sigset(A,B) do { struct sigaction s; sigset_t set; int rc; \
- DBUG_ASSERT((A) != 0); \
- sigemptyset(&set); \
- s.sa_handler = (B); \
- s.sa_mask = set; \
- s.sa_flags = 0; \
- rc= sigaction((A), &s, (struct sigaction *) NULL);\
- DBUG_ASSERT(rc == 0); \
+#define my_sigset(A,B) do { struct sigaction l_s; sigset_t l_set; int l_rc; \
+ DBUG_ASSERT((A) != 0); \
+ sigemptyset(&l_set); \
+ l_s.sa_handler = (B); \
+ l_s.sa_mask = l_set; \
+ l_s.sa_flags = 0; \
+ l_rc= sigaction((A), &l_s, (struct sigaction *) NULL);\
+ DBUG_ASSERT(l_rc == 0); \
} while (0)
#elif defined(HAVE_SIGSET) && !defined(my_sigset)
#define my_sigset(A,B) sigset((A),(B))
Modified: Frontier/vendor/MySQL/current/win32/include/my_sys.h
===================================================================
--- Frontier/vendor/MySQL/current/win32/include/my_sys.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/win32/include/my_sys.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -260,9 +260,10 @@
NEAR my_disable_flush_key_blocks, NEAR my_disable_symlinks;
extern char wild_many,wild_one,wild_prefix;
extern const char *charsets_dir;
-extern char *defaults_extra_file;
-extern const char *defaults_group_suffix;
-extern const char *defaults_file;
+/* from default.c */
+extern char *my_defaults_extra_file;
+extern const char *my_defaults_group_suffix;
+extern const char *my_defaults_file;
extern my_bool timed_mutexes;
@@ -321,8 +322,17 @@
extern struct st_my_file_info *my_file_info;
+typedef struct st_dynamic_array
+{
+ char *buffer;
+ uint elements,max_element;
+ uint alloc_increment;
+ uint size_of_element;
+} DYNAMIC_ARRAY;
+
typedef struct st_my_tmpdir
{
+ DYNAMIC_ARRAY full_list;
char **list;
uint cur, max;
#ifdef THREAD
@@ -330,14 +340,6 @@
#endif
} MY_TMPDIR;
-typedef struct st_dynamic_array
-{
- char *buffer;
- uint elements,max_element;
- uint alloc_increment;
- uint size_of_element;
-} DYNAMIC_ARRAY;
-
typedef struct st_dynamic_string
{
char *str;
Modified: Frontier/vendor/MySQL/current/win32/include/mysql.h
===================================================================
--- Frontier/vendor/MySQL/current/win32/include/mysql.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/win32/include/mysql.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -87,6 +87,7 @@
#define IS_NUM(t) ((t) <= FIELD_TYPE_INT24 || (t) == FIELD_TYPE_YEAR || (t) == FIELD_TYPE_NEWDECIMAL)
#define IS_NUM_FIELD(f) ((f)->flags & NUM_FLAG)
#define INTERNAL_NUM_FIELD(f) (((f)->type <= FIELD_TYPE_INT24 && ((f)->type != FIELD_TYPE_TIMESTAMP || (f)->length == 14 || (f)->length == 8)) || (f)->type == FIELD_TYPE_YEAR)
+#define IS_LONGDATA(t) ((t) >= MYSQL_TYPE_TINY_BLOB && (t) <= MYSQL_TYPE_STRING)
typedef struct st_mysql_field {
@@ -783,7 +784,7 @@
unsigned long length);
int STDCALL mysql_stmt_execute(MYSQL_STMT *stmt);
int STDCALL mysql_stmt_fetch(MYSQL_STMT *stmt);
-int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind,
+int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind_arg,
unsigned int column,
unsigned long offset);
int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt);
Modified: Frontier/vendor/MySQL/current/win32/include/mysql_version.h
===================================================================
--- Frontier/vendor/MySQL/current/win32/include/mysql_version.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/win32/include/mysql_version.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -1,29 +1,29 @@
-/* Copyright Abandoned 1996, 1999, 2001 MySQL AB
- This file is public domain and comes with NO WARRANTY of any kind */
-
-/* Version numbers for protocol & mysqld */
-
-#ifndef _mysql_version_h
-#define _mysql_version_h
-#ifdef _CUSTOMCONFIG_
-#include <custom_conf.h>
-#else
-#define PROTOCOL_VERSION 10
-#define MYSQL_SERVER_VERSION "5.0.37"
-#define MYSQL_BASE_VERSION "mysqld-5.0"
-#define MYSQL_SERVER_SUFFIX_DEF "-community-debug"
-#define FRM_VER 6
-#define MYSQL_VERSION_ID 50037
-#define MYSQL_PORT 3306
-#define MYSQL_UNIX_ADDR "/tmp/mysql.sock"
-#define MYSQL_CONFIG_NAME "my"
-#define MYSQL_COMPILATION_COMMENT "MySQL Community Edition - Debug (GPL)"
-
-/* mysqld compile time options */
-#endif /* _CUSTOMCONFIG_ */
-
-#ifndef LICENSE
-#define LICENSE GPL
-#endif /* LICENSE */
-
-#endif /* _mysql_version_h */
+/* Copyright Abandoned 1996, 1999, 2001 MySQL AB
+ This file is public domain and comes with NO WARRANTY of any kind */
+
+/* Version numbers for protocol & mysqld */
+
+#ifndef _mysql_version_h
+#define _mysql_version_h
+#ifdef _CUSTOMCONFIG_
+#include <custom_conf.h>
+#else
+#define PROTOCOL_VERSION 10
+#define MYSQL_SERVER_VERSION "5.0.41"
+#define MYSQL_BASE_VERSION "mysqld-5.0"
+#define MYSQL_SERVER_SUFFIX_DEF "-community-nt"
+#define FRM_VER 6
+#define MYSQL_VERSION_ID 50041
+#define MYSQL_PORT 3306
+#define MYSQL_UNIX_ADDR "/tmp/mysql.sock"
+#define MYSQL_CONFIG_NAME "my"
+#define MYSQL_COMPILATION_COMMENT "MySQL Community Edition (GPL)"
+
+/* mysqld compile time options */
+#endif /* _CUSTOMCONFIG_ */
+
+#ifndef LICENSE
+#define LICENSE GPL
+#endif /* LICENSE */
+
+#endif /* _mysql_version_h */
Modified: Frontier/vendor/MySQL/current/win32/include/mysqld_ername.h
===================================================================
--- Frontier/vendor/MySQL/current/win32/include/mysqld_ername.h 2007-06-17 00:50:36 UTC (rev 1683)
+++ Frontier/vendor/MySQL/current/win32/include/mysqld_ername.h 2007-06-17 03:54:56 UTC (rev 1684)
@@ -1,474 +1,474 @@
-/* Autogenerated file, please don't edit */
-
-{ "ER_HASHCHK", 1000 },
-{ "ER_NISAMCHK", 1001 },
-{ "ER_NO", 1002 },
-{ "ER_YES", 1003 },
-{ "ER_CANT_CREATE_FILE", 1004 },
-{ "ER_CANT_CREATE_TABLE", 1005 },
-{ "ER_CANT_CREATE_DB", 1006 },
-{ "ER_DB_CREATE_EXISTS", 1007 },
-{ "ER_DB_DROP_EXISTS", 1008 },
-{ "ER_DB_DROP_DELETE", 1009 },
-{ "ER_DB_DROP_RMDIR", 1010 },
-{ "ER_CANT_DELETE_FILE", 1011 },
-{ "ER_CANT_FIND_SYSTEM_REC", 1012 },
-{ "ER_CANT_GET_STAT", 1013 },
-{ "ER_CANT_GET_WD", 1014 },
-{ "ER_CANT_LOCK", 1015 },
-{ "ER_CANT_OPEN_FILE", 1016 },
-{ "ER_FILE_NOT_FOUND", 1017 },
-{ "ER_CANT_READ_DIR", 1018 },
-{ "ER_CANT_SET_WD", 1019 },
-{ "ER_CHECKREAD", 1020 },
-{ "ER_DISK_FULL", 1021 },
-{ "ER_DUP_KEY", 1022 },
-{ "ER_ERROR_ON_CLOSE", 1023 },
-{ "ER_ERROR_ON_READ", 1024 },
-{ "ER_ERROR_ON_RENAME", 1025 },
-{ "ER_ERROR_ON_WRITE", 1026 },
-{ "ER_FILE_USED", 1027 },
-{ "ER_FILSORT_ABORT", 1028 },
-{ "ER_FORM_NOT_FOUND", 1029 },
-{ "ER_GET_ERRNO", 1030 },
-{ "ER_ILLEGAL_HA", 1031 },
-{ "ER_KEY_NOT_FOUND", 1032 },
-{ "ER_NOT_FORM_FILE", 1033 },
-{ "ER_NOT_KEYFILE", 1034 },
-{ "ER_OLD_KEYFILE", 1035 },
-{ "ER_OPEN_AS_READONLY", 1036 },
-{ "ER_OUTOFMEMORY", 1037 },
-{ "ER_OUT_OF_SORTMEMORY", 1038 },
-{ "ER_UNEXPECTED_EOF", 1039 },
-{ "ER_CON_COUNT_ERROR", 1040 },
-{ "ER_OUT_OF_RESOURCES", 1041 },
-{ "ER_BAD_HOST_ERROR", 1042 },
-{ "ER_HANDSHAKE_ERROR", 1043 },
-{ "ER_DBACCESS_DENIED_ERROR", 1044 },
-{ "ER_ACCESS_DENIED_ERROR", 1045 },
-{ "ER_NO_DB_ERROR", 1046 },
-{ "ER_UNKNOWN_COM_ERROR", 1047 },
-{ "ER_BAD_NULL_ERROR", 1048 },
-{ "ER_BAD_DB_ERROR", 1049 },
-{ "ER_TABLE_EXISTS_ERROR", 1050 },
-{ "ER_BAD_TABLE_ERROR", 1051 },
-{ "ER_NON_UNIQ_ERROR", 1052 },
-{ "ER_SERVER_SHUTDOWN", 1053 },
-{ "ER_BAD_FIELD_ERROR", 1054 },
-{ "ER_WRONG_FIELD_WITH_GROUP", 1055 },
-{ "ER_WRONG_GROUP_FIELD", 1056 },
-{ "ER_WRONG_SUM_SELECT", 1057 },
-{ "ER_WRONG_VALUE_COUNT", 1058 },
-{ "ER_TOO_LONG_IDENT", 1059 },
-{ "ER_DUP_FIELDNAME", 1060 },
-{ "ER_DUP_KEYNAME", 1061 },
-{ "ER_DUP_ENTRY", 1062 },
-{ "ER_WRONG_FIELD_SPEC", 1063 },
-{ "ER_PARSE_ERROR", 1064 },
-{ "ER_EMPTY_QUERY", 1065 },
-{ "ER_NONUNIQ_TABLE", 1066 },
-{ "ER_INVALID_DEFAULT", 1067 },
-{ "ER_MULTIPLE_PRI_KEY", 1068 },
-{ "ER_TOO_MANY_KEYS", 1069 },
-{ "ER_TOO_MANY_KEY_PARTS", 1070 },
-{ "ER_TOO_LONG_KEY", 1071 },
-{ "ER_KEY_COLUMN_DOES_NOT_EXITS", 1072 },
-{ "ER_BLOB_USED_AS_KEY", 1073 },
-{ "ER_TOO_BIG_FIELDLENGTH", 1074 },
-{ "ER_WRONG_AUTO_KEY", 1075 },
-{ "ER_READY", 1076 },
-{ "ER_NORMAL_SHUTDOWN", 1077 },
-{ "ER_GOT_SIGNAL", 1078 },
-{ "ER_SHUTDOWN_COMPLETE", 1079 },
-{ "ER_FORCING_CLOSE", 1080 },
-{ "ER_IPSOCK_ERROR", 1081 },
-{ "ER_NO_SUCH_INDEX", 1082 },
-{ "ER_WRONG_FIELD_TERMINATORS", 1083 },
-{ "ER_BLOBS_AND_NO_TERMINATED", 1084 },
-{ "ER_TEXTFILE_NOT_READABLE", 1085 },
-{ "ER_FILE_EXISTS_ERROR", 1086 },
-{ "ER_LOAD_INFO", 1087 },
-{ "ER_ALTER_INFO", 1088 },
-{ "ER_WRONG_SUB_KEY", 1089 },
-{ "ER_CANT_REMOVE_ALL_FIELDS", 1090 },
-{ "ER_CANT_DROP_FIELD_OR_KEY", 1091 },
-{ "ER_INSERT_INFO", 1092 },
-{ "ER_UPDATE_TABLE_USED", 1093 },
-{ "ER_NO_SUCH_THREAD", 1094 },
-{ "ER_KILL_DENIED_ERROR", 1095 },
-{ "ER_NO_TABLES_USED", 1096 },
-{ "ER_TOO_BIG_SET", 1097 },
-{ "ER_NO_UNIQUE_LOGFILE", 1098 },
-{ "ER_TABLE_NOT_LOCKED_FOR_WRITE", 1099 },
-{ "ER_TABLE_NOT_LOCKED", 1100 },
-{ "ER_BLOB_CANT_HAVE_DEFAULT", 1101 },
-{ "ER_WRONG_DB_NAME", 1102 },
-{ "ER_WRONG_TABLE_NAME", 1103 },
-{ "ER_TOO_BIG_SELECT", 1104 },
-{ "ER_UNKNOWN_ERROR", 1105 },
-{ "ER_UNKNOWN_PROCEDURE", 1106 },
-{ "ER_WRONG_PARAMCOUNT_TO_PROCEDURE", 1107 },
-{ "ER_WRONG_PARAMETERS_TO_PROCEDURE", 1108 },
-{ "ER_UNKNOWN_TABLE", 1109 },
-{ "ER_FIELD_SPECIFIED_TWICE", 1110 },
-{ "ER_INVALID_GROUP_FUNC_USE", 1111 },
-{ "ER_UNSUPPORTED_EXTENSION", 1112 },
-{ "ER_TABLE_MUST_HAVE_COLUMNS", 1113 },
-{ "ER_RECORD_FILE_FULL", 1114 },
-{ "ER_UNKNOWN_CHARACTER_SET", 1115 },
-{ "ER_TOO_MANY_TABLES", 1116 },
-{ "ER_TOO_MANY_FIELDS", 1117 },
-{ "ER_TOO_BIG_ROWSIZE", 1118 },
-{ "ER_STACK_OVERRUN", 1119 },
-{ "ER_WRONG_OUTER_JOIN", 1120 },
-{ "ER_NULL_COLUMN_IN_INDEX", 1121 },
-{ "ER_CANT_FIND_UDF", 1122 },
-{ "ER_CANT_INITIALIZE_UDF", 1123 },
-{ "ER_UDF_NO_PATHS", 1124 },
-{ "ER_UDF_EXISTS", 1125 },
-{ "ER_CANT_OPEN_LIBRARY", 1126 },
-{ "ER_CANT_FIND_DL_ENTRY", 1127 },
-{ "ER_FUNCTION_NOT_DEFINED", 1128 },
-{ "ER_HOST_IS_BLOCKED", 1129 },
-{ "ER_HOST_NOT_PRIVILEGED", 1130 },
-{ "ER_PASSWORD_ANONYMOUS_USER", 1131 },
-{ "ER_PASSWORD_NOT_ALLOWED", 1132 },
-{ "ER_PASSWORD_NO_MATCH", 1133 },
-{ "ER_UPDATE_INFO", 1134 },
-{ "ER_CANT_CREATE_THREAD", 1135 },
-{ "ER_WRONG_VALUE_COUNT_ON_ROW", 1136 },
-{ "ER_CANT_REOPEN_TABLE", 1137 },
-{ "ER_INVALID_USE_OF_NULL", 1138 },
-{ "ER_REGEXP_ERROR", 1139 },
-{ "ER_MIX_OF_GROUP_FUNC_AND_FIELDS", 1140 },
-{ "ER_NONEXISTING_GRANT", 1141 },
-{ "ER_TABLEACCESS_DENIED_ERROR", 1142 },
-{ "ER_COLUMNACCESS_DENIED_ERROR", 1143 },
-{ "ER_ILLEGAL_GRANT_FOR_TABLE", 1144 },
-{ "ER_GRANT_WRONG_HOST_OR_USER", 1145 },
-{ "ER_NO_SUCH_TABLE", 1146 },
-{ "ER_NONEXISTING_TABLE_GRANT", 1147 },
-{ "ER_NOT_ALLOWED_COMMAND", 1148 },
-{ "ER_SYNTAX_ERROR", 1149 },
-{ "ER_DELAYED_CANT_CHANGE_LOCK", 1150 },
-{ "ER_TOO_MANY_DELAYED_THREADS", 1151 },
-{ "ER_ABORTING_CONNECTION", 1152 },
-{ "ER_NET...
[truncated message content] |
