Menu
▾
▴
SF.net SVN: frontierkernel:[1806] Frontier/branches/Conversant/Common
|
From: <set...@us...> - 2009-05-29 18:31:16
|
Revision: 1806
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1806&view=rev
Author: sethdill
Date: 2009-05-29 18:31:04 +0000 (Fri, 29 May 2009)
Log Message:
-----------
More synchro between trunk and Conversant branch. Pretty sure none of this matters, but I'm trying it anyway.
Modified Paths:
--------------
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/m_ctype.h
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_config.h
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_global.h
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_pthread.h
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_sys.h
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_time.h
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql.h
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql_com.h
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql_version.h
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/raid.h
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/thr_lock.h
Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/violite.h
Frontier/branches/Conversant/Common/headers/frontierdefs.h
Frontier/branches/Conversant/Common/source/langmysql.c
Frontier/branches/Conversant/Common/source/langsqlite.c
Modified: Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/m_ctype.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/m_ctype.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/m_ctype.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -21,8 +21,6 @@
#ifndef _m_ctype_h
#define _m_ctype_h
-// #include <my_attribute.h>
-
#ifdef __cplusplus
extern "C" {
#endif
Modified: Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_config.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_config.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_config.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -2,7 +2,7 @@
/* config.h.in. Generated from configure.in by autoheader. */
/* Support big tables */
-/* #undef BIG_TABLES */
+#define BIG_TABLES 1
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
@@ -45,7 +45,7 @@
#define HAVE_ALLOCA_H 1
/* Builds Archive Storage Engine */
-/* #undef HAVE_ARCHIVE_DB */
+#define HAVE_ARCHIVE_DB 1
/* Define to 1 if you have the <arpa/inet.h> header file. */
#define HAVE_ARPA_INET_H 1
@@ -69,7 +69,7 @@
/* #undef HAVE_BFILL */
/* Builds Blackhole Storage Engine */
-/* #undef HAVE_BLACKHOLE_DB */
+#define HAVE_BLACKHOLE_DB 1
/* Define to 1 if you have the `bmove' function. */
/* #undef HAVE_BMOVE */
@@ -87,10 +87,10 @@
#define HAVE_BZERO 1
/* Define to enable charset armscii8 */
-/* #undef HAVE_CHARSET_armscii8 */
+#define HAVE_CHARSET_armscii8 1
/* Define to enable ascii character set */
-/* #undef HAVE_CHARSET_ascii */
+#define HAVE_CHARSET_ascii 1
/* Define to enable charset big5 */
#define HAVE_CHARSET_big5 1
@@ -99,28 +99,28 @@
#define HAVE_CHARSET_cp1250 1
/* Define to enable charset cp1251 */
-/* #undef HAVE_CHARSET_cp1251 */
+#define HAVE_CHARSET_cp1251 1
/* Define to enable charset cp1256 */
-/* #undef HAVE_CHARSET_cp1256 */
+#define HAVE_CHARSET_cp1256 1
/* Define to enable charset cp1257 */
-/* #undef HAVE_CHARSET_cp1257 */
+#define HAVE_CHARSET_cp1257 1
/* Define to enable charset cp850 */
-/* #undef HAVE_CHARSET_cp850 */
+#define HAVE_CHARSET_cp850 1
/* Define to enable charset cp852 */
-/* #undef HAVE_CHARSET_cp852 */
+#define HAVE_CHARSET_cp852 1
/* Define to enable charset cp866 */
-/* #undef HAVE_CHARSET_cp866 */
+#define HAVE_CHARSET_cp866 1
/* Define to enable charset cp932 */
#define HAVE_CHARSET_cp932 1
/* Define to enable charset dec8 */
-/* #undef HAVE_CHARSET_dec8 */
+#define HAVE_CHARSET_dec8 1
/* Define to enable charset eucjpms */
#define HAVE_CHARSET_eucjpms 1
@@ -135,25 +135,25 @@
#define HAVE_CHARSET_gbk 1
/* Define to enable charset geostd8 */
-/* #undef HAVE_CHARSET_geostd8 */
+#define HAVE_CHARSET_geostd8 1
/* Define to enable charset greek */
-/* #undef HAVE_CHARSET_greek */
+#define HAVE_CHARSET_greek 1
/* Define to enable charset hebrew */
-/* #undef HAVE_CHARSET_hebrew */
+#define HAVE_CHARSET_hebrew 1
/* Define to enable charset hp8 */
-/* #undef HAVE_CHARSET_hp8 */
+#define HAVE_CHARSET_hp8 1
/* Define to enable charset keybcs2 */
-/* #undef HAVE_CHARSET_keybcs2 */
+#define HAVE_CHARSET_keybcs2 1
/* Define to enable charset koi8r */
-/* #undef HAVE_CHARSET_koi8r */
+#define HAVE_CHARSET_koi8r 1
/* Define to enable charset koi8u */
-/* #undef HAVE_CHARSET_koi8u */
+#define HAVE_CHARSET_koi8u 1
/* Define to enable charset latin1 */
#define HAVE_CHARSET_latin1 1
@@ -162,22 +162,22 @@
#define HAVE_CHARSET_latin2 1
/* Define to enable charset latin5 */
-/* #undef HAVE_CHARSET_latin5 */
+#define HAVE_CHARSET_latin5 1
/* Define to enable charset latin7 */
-/* #undef HAVE_CHARSET_latin7 */
+#define HAVE_CHARSET_latin7 1
/* Define to enable charset macce */
-/* #undef HAVE_CHARSET_macce */
+#define HAVE_CHARSET_macce 1
/* Define to enable charset macroman */
-/* #undef HAVE_CHARSET_macroman */
+#define HAVE_CHARSET_macroman 1
/* Define to enable charset sjis */
#define HAVE_CHARSET_sjis 1
/* Define to enable charset swe7 */
-/* #undef HAVE_CHARSET_swe7 */
+#define HAVE_CHARSET_swe7 1
/* Define to enable charset tis620 */
#define HAVE_CHARSET_tis620 1
@@ -207,7 +207,7 @@
/* #undef HAVE_CRYPT_H */
/* Builds the CSV Storage Engine */
-/* #undef HAVE_CSV_DB */
+#define HAVE_CSV_DB 1
/* Define to 1 if you have the <curses.h> header file. */
#define HAVE_CURSES_H 1
@@ -223,10 +223,6 @@
don't. */
/* #undef HAVE_DECL_SHM_HUGETLB */
-/* Define to 1 if you have the declaration of `tgoto', and to 0 if you don't.
- */
-#define HAVE_DECL_TGOTO 1
-
/* Whether we are using DEC threads */
/* #undef HAVE_DEC_THREADS */
@@ -249,7 +245,7 @@
/* #undef HAVE_EMBEDDED_PRIVILEGE_CONTROL */
/* Builds Example DB */
-/* #undef HAVE_EXAMPLE_DB */
+#define HAVE_EXAMPLE_DB 1
/* Defined by configure. Use explicit template instantiation. */
#define HAVE_EXPLICIT_TEMPLATE_INSTANTIATION 1
@@ -270,7 +266,7 @@
/* #undef HAVE_FDATASYNC */
/* Define to enable Federated Handler */
-/* #undef HAVE_FEDERATED_DB */
+#define HAVE_FEDERATED_DB 1
/* Define to 1 if you have the `fgetln' function. */
#define HAVE_FGETLN 1
@@ -355,7 +351,7 @@
#define HAVE_GRP_H 1
/* HIST_ENTRY is defined in the outer libeditreadline */
-#define HAVE_HIST_ENTRY 1
+/* #undef HAVE_HIST_ENTRY */
/* Define to 1 if you have the <ieeefp.h> header file. */
/* #undef HAVE_IEEEFP_H */
@@ -499,7 +495,7 @@
#define HAVE_MMAP 1
/* Using Ndb Cluster DB */
-/* #undef HAVE_NDBCLUSTER_DB */
+#define HAVE_NDBCLUSTER_DB 1
/* Define to 1 if you have the <ndir.h> header file. */
/* #undef HAVE_NDIR_H */
@@ -523,7 +519,7 @@
#define HAVE_OFF_T 1
/* Defined by configure. Using yaSSL for OpenSSL emulation. */
-/* #undef HAVE_OPENSSL */
+#define HAVE_OPENSSL 1
/* Define to 1 if you have the <paths.h> header file. */
#define HAVE_PATHS_H 1
@@ -807,9 +803,6 @@
/* Define to 1 if you have the <sys/param.h> header file. */
#define HAVE_SYS_PARAM_H 1
-/* Define to 1 if you have the <sys/prctl.h> header file. */
-/* #undef HAVE_SYS_PRCTL_H */
-
/* Define to 1 if you have the <sys/ptem.h> header file. */
/* #undef HAVE_SYS_PTEM_H */
@@ -951,7 +944,7 @@
#define HAVE_WCWIDTH
/* Defined by configure. Using yaSSL for OpenSSL emulation. */
-/* #undef HAVE_YASSL */
+#define HAVE_YASSL 1
/* Define if /proc/meminfo shows the huge page size (Linux only) */
/* #undef HUGETLB_USE_PROC_MEMINFO */
@@ -959,7 +952,7 @@
/* Define if you have -lwrap */
/* #undef LIBWRAP */
-/* Machine type name, eg sparc */
+/* Machine type name, eg sun10 */
#define MACHINE_TYPE "i686"
/* Maximum number of indexes per table */
@@ -975,10 +968,10 @@
/* #undef NDB_SCI_TRANSPORTER */
/* Including Ndb Cluster DB shared memory transporter */
-/* #undef NDB_SHM_TRANSPORTER */
+#define NDB_SHM_TRANSPORTER 1
/* NDB build version */
-#define NDB_VERSION_BUILD 45
+#define NDB_VERSION_BUILD 37
/* NDB major version */
#define NDB_VERSION_MAJOR 5
@@ -1078,8 +1071,8 @@
/* The struct rlimit type to use with setrlimit */
#define STRUCT_RLIMIT struct rlimit
-/* Name of system, eg sun-solaris */
-#define SYSTEM_TYPE "apple-darwin9.1.0"
+/* Name of system, eg solaris */
+#define SYSTEM_TYPE "apple-darwin8.5.1"
/* Whether we build for Linux */
/* #undef TARGET_OS_LINUX */
@@ -1091,9 +1084,6 @@
/* 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
@@ -1105,7 +1095,7 @@
/* used libedit interface (can we dereference result of
rl_completion_entry_function) */
-#define USE_LIBEDIT_INTERFACE 1
+/* #undef USE_LIBEDIT_INTERFACE */
/* Use multi-byte character routines */
#define USE_MB 1
@@ -1118,13 +1108,13 @@
/* used new readline interface (are rl_completion_func_t and
rl_compentry_func_t defined) */
-/* #undef USE_NEW_READLINE_INTERFACE */
+#define USE_NEW_READLINE_INTERFACE 1
/* the pstack backtrace library */
/* #undef USE_PSTACK */
/* Version number of package */
-#define VERSION "5.0.45"
+#define VERSION "5.0.37"
/* sighandler type is void (*signal ()) (); */
#define VOID_SIGHANDLER 1
Modified: Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_global.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_global.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_global.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -86,14 +86,6 @@
#endif
#endif /* _WIN32... */
-/* Make it easier to add conditionl code for windows */
-#ifdef __WIN__
-#define IF_WIN(A,B) (A)
-#else
-#define IF_WIN(A,B) (B)
-#endif
-
-
/* Some defines to avoid ifdefs in the code */
#ifndef NETWARE_YIELD
#define NETWARE_YIELD
@@ -505,14 +497,50 @@
#define my_const_cast(A) (A)
#endif
-#include <my_attribute.h>
+/*
+ Disable __attribute__() on gcc < 2.7, g++ < 3.4, and non-gcc compilers.
+ Some forms of __attribute__ are actually supported in earlier versions of
+ g++, but we just disable them all because we only use them to generate
+ compilation warnings.
+*/
+#ifndef __attribute__
+# if !defined(__GNUC__)
+# define __attribute__(A)
+# elif GCC_VERSION < 2008
+# define __attribute__(A)
+# elif defined(__cplusplus) && GCC_VERSION < 3004
+# define __attribute__(A)
+# endif
+#endif
/*
+ __attribute__((format(...))) is only supported in gcc >= 2.8 and g++ >= 3.4
+ But that's already covered by the __attribute__ tests above, so this is
+ just a convenience macro.
+*/
+#ifndef ATTRIBUTE_FORMAT
+# define ATTRIBUTE_FORMAT(style, m, n) __attribute__((format(style, m, n)))
+#endif
+
+/*
+
+ __attribute__((format(...))) on a function pointer is not supported
+ until gcc 3.1
+*/
+#ifndef ATTRIBUTE_FORMAT_FPTR
+# if (GCC_VERSION >= 3001)
+# define ATTRIBUTE_FORMAT_FPTR(style, m, n) ATTRIBUTE_FORMAT(style, m, n)
+# else
+# define ATTRIBUTE_FORMAT_FPTR(style, m, n)
+# endif /* GNUC >= 3.1 */
+#endif
+
+/*
Wen using the embedded library, users might run into link problems,
duplicate declaration of __cxa_pure_virtual, solved by declaring it a
weak symbol.
*/
-#if defined(USE_MYSYS_NEW) && ! defined(DONT_DECLARE_CXA_PURE_VIRTUAL)
+#ifdef USE_MYSYS_NEW
C_MODE_START
int __cxa_pure_virtual () __attribute__ ((weak));
C_MODE_END
@@ -784,21 +812,10 @@
#define SSIZE_MAX ((~((size_t) 0)) / 2)
#endif
-#ifndef HAVE_FINITE
-#define finite(x) (1.0 / fabs(x) > 0.0)
+#if !defined(HAVE_ISINF) && !defined(isinf)
+#define isinf(X) 0
#endif
-#ifndef HAVE_ISNAN
-#define isnan(x) ((x) != (x))
-#endif
-
-#ifdef HAVE_ISINF
-/* isinf() can be used in both C and C++ code */
-#define my_isinf(X) isinf(X)
-#else
-#define my_isinf(X) (!finite(X) && !isnan(X))
-#endif
-
/* Define missing math constants. */
#ifndef M_PI
#define M_PI 3.14159265358979323846
@@ -829,21 +846,6 @@
#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
@@ -1076,7 +1078,7 @@
*/
#define uint3korr(A) (long) (*((unsigned int *) (A)) & 0xFFFFFF)
#endif
-#define uint4korr(A) (*((uint32 *) (A)))
+#define uint4korr(A) (*((unsigned long *) (A)))
#define uint5korr(A) ((ulonglong)(((uint32) ((uchar) (A)[0])) +\
(((uint32) ((uchar) (A)[1])) << 8) +\
(((uint32) ((uchar) (A)[2])) << 16) +\
@@ -1340,13 +1342,4 @@
#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/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_pthread.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_pthread.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_pthread.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -80,17 +80,11 @@
typedef struct {
uint32 waiting;
- CRITICAL_SECTION lock_waiting;
-
- enum {
- SIGNAL= 0,
- BROADCAST= 1,
- MAX_EVENTS= 2
- } EVENTS;
-
- HANDLE events[MAX_EVENTS];
- HANDLE broadcast_block_event;
-
+#ifdef OS2
+ HEV semaphore;
+#else
+ HANDLE semaphore;
+#endif
} pthread_cond_t;
typedef int pthread_mutexattr_t;
@@ -376,14 +370,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 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); \
+#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); \
} while (0)
#elif defined(HAVE_SIGSET) && !defined(my_sigset)
#define my_sigset(A,B) sigset((A),(B))
Modified: Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_sys.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_sys.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_sys.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -31,7 +31,10 @@
#include <my_pthread.h>
#endif
+#ifndef _m_ctype_h
#include <m_ctype.h> /* for CHARSET_INFO */
+#endif
+
#include <stdarg.h>
#include <typelib.h>
@@ -66,8 +69,8 @@
#define MY_ALLOW_ZERO_PTR 64 /* my_realloc() ; zero ptr -> malloc */
#define MY_FREE_ON_ERROR 128 /* my_realloc() ; Free old ptr on error */
#define MY_HOLD_ON_ERROR 256 /* my_realloc() ; Return old ptr on error */
+#define MY_THREADSAFE 128 /* pread/pwrite: Don't allow interrupts */
#define MY_DONT_OVERWRITE_FILE 1024 /* my_copy: Don't overwrite file */
-#define MY_THREADSAFE 2048 /* my_seek(): lock fd mutex */
#define MY_CHECK_ERROR 1 /* Params to my_end; Check open-close */
#define MY_GIVE_INFO 2 /* Give time info about process*/
@@ -257,10 +260,9 @@
NEAR my_disable_flush_key_blocks, NEAR my_disable_symlinks;
extern char wild_many,wild_one,wild_prefix;
extern const char *charsets_dir;
-/* from default.c */
-extern char *my_defaults_extra_file;
-extern const char *my_defaults_group_suffix;
-extern const char *my_defaults_file;
+extern char *defaults_extra_file;
+extern const char *defaults_group_suffix;
+extern const char *defaults_file;
extern my_bool timed_mutexes;
@@ -319,17 +321,8 @@
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
@@ -337,6 +330,14 @@
#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/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_time.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_time.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/my_time.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -30,13 +30,7 @@
/*
Portable time_t replacement.
- 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
+ Should be signed and hold seconds for 1902-2038 range.
*/
typedef long my_time_t;
@@ -79,20 +73,19 @@
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 *);
-ulonglong TIME_to_ulonglong_date(const MYSQL_TIME *);
-ulonglong TIME_to_ulonglong_time(const MYSQL_TIME *);
-ulonglong TIME_to_ulonglong(const MYSQL_TIME *);
+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);
my_bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time,
int *warning);
-int check_time_range(struct st_mysql_time *, int *warning);
+int check_time_range(struct st_mysql_time *time, int *warning);
long calc_daynr(uint year,uint month,uint day);
uint calc_days_in_year(uint year);
-uint year_2000_handling(uint year);
void init_time(void);
Modified: Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -87,7 +87,6 @@
#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 {
@@ -784,7 +783,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_arg,
+int STDCALL mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *bind,
unsigned int column,
unsigned long offset);
int STDCALL mysql_stmt_store_result(MYSQL_STMT *stmt);
Modified: Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql_com.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql_com.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql_com.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -345,11 +345,6 @@
int net_real_write(NET *net,const char *packet,unsigned long len);
unsigned long my_net_read(NET *net);
-#ifdef _global_h
-void my_net_set_write_timeout(NET *net, uint timeout);
-void my_net_set_read_timeout(NET *net, uint timeout);
-#endif
-
/*
The following function is not meant for normal usage
Currently it's used internally by manager.c
Modified: Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql_version.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql_version.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/mysql_version.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -9,15 +9,15 @@
#include <custom_conf.h>
#else
#define PROTOCOL_VERSION 10
-#define MYSQL_SERVER_VERSION "5.0.45"
+#define MYSQL_SERVER_VERSION "5.0.37"
#define MYSQL_BASE_VERSION "mysqld-5.0"
#define MYSQL_SERVER_SUFFIX_DEF ""
#define FRM_VER 6
-#define MYSQL_VERSION_ID 50045
+#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 "Source distribution"
+#define MYSQL_COMPILATION_COMMENT "MySQL Community Server (GPL)"
/* mysqld compile time options */
#endif /* _CUSTOMCONFIG_ */
Modified: Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/raid.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/raid.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/raid.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -140,7 +140,7 @@
inline void Calculate()
{
DBUG_ENTER("RaidFd::_Calculate");
- DBUG_PRINT("info",("_position: %lu _raid_chunksize: %lu _size: %lu",
+ DBUG_PRINT("info",("_position: %lu _raid_chunksize: %d, _size: %lu",
(ulong) _position, _raid_chunksize, (ulong) _size));
_total_block = (ulong) (_position / _raid_chunksize);
@@ -148,7 +148,7 @@
_remaining_bytes = (uint) (_raid_chunksize -
(_position - _total_block * _raid_chunksize));
DBUG_PRINT("info",
- ("_total_block: %lu this_block: %d _remaining_bytes: %d",
+ ("_total_block: %d this_block: %d _remaining_bytes:%d",
_total_block, _this_block, _remaining_bytes));
DBUG_VOID_RETURN;
}
Modified: Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/thr_lock.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/thr_lock.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/thr_lock.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -54,11 +54,6 @@
TL_WRITE_CONCURRENT_INSERT,
/* Write used by INSERT DELAYED. Allows READ locks */
TL_WRITE_DELAYED,
- /*
- parser only! Late bound low_priority flag.
- At open_tables() becomes thd->update_lock_default.
- */
- TL_WRITE_DEFAULT,
/* WRITE lock that has lower priority than TL_READ */
TL_WRITE_LOW_PRIORITY,
/* Normal WRITE lock */
Modified: Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/violite.h
===================================================================
--- Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/violite.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/MySQL/osx10.4-i686/include/violite.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -88,6 +88,7 @@
/* Remotes in_addr */
void vio_in_addr(Vio *vio, struct in_addr *in);
my_bool vio_poll_read(Vio *vio,uint timeout);
+void vio_timeout(Vio *vio,uint which, uint timeout);
#ifdef HAVE_OPENSSL
#include <openssl/opensslv.h>
@@ -100,12 +101,7 @@
#define HEADER_DES_LOCL_H dummy_something
#define YASSL_MYSQL_COMPATIBLE
-#ifndef YASSL_PREFIX
#define YASSL_PREFIX
-#endif
-/* 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/branches/Conversant/Common/headers/frontierdefs.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/frontierdefs.h 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/headers/frontierdefs.h 2009-05-29 18:31:04 UTC (rev 1806)
@@ -111,6 +111,10 @@
#define Rez true
#define DeRez false
+#ifndef OPMLEDITOR /*2008-09-08 aradke: keep opml editor lean and mean*/
+ #define FRONTIER_MYSQL 1 /*include mysql database client library*/
+ #define FRONTIER_SQLITE 1 /*include sqlite database code*/
+#endif
#define SystemSevenOrLater 1
Modified: Frontier/branches/Conversant/Common/source/langmysql.c
===================================================================
--- Frontier/branches/Conversant/Common/source/langmysql.c 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/source/langmysql.c 2009-05-29 18:31:04 UTC (rev 1806)
@@ -42,14 +42,11 @@
#include "oplist.h"
#include "langsystem7.h"
-// #ifdef WIN95VERSION
+#include "langmysql.h"
-// #include "my_global.h"
-
-// #endif // WIN95VERSION
-
+#ifdef FRONTIER_MYSQL
#include "mysql.h"
-#include "langmysql.h"
+#endif
/*
@@ -110,6 +107,8 @@
setbooleanvalue ( false, v ); // by default, sqlite functions return false
switch ( token ) {
+
+#ifdef FRONTIER_MYSQL
case initfunc: // initialize MySQL
@@ -218,6 +217,8 @@
case closefunc: // close a MySQL db
return ( mysqlcloseverb ( hp1, v, bserror ) );
+
+#endif
default:
@@ -236,6 +237,7 @@
} /* mysqlinitverbs */
+#ifdef FRONTIER_MYSQL
boolean mysqlinitverb ( hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror ) {
@@ -1776,3 +1778,5 @@
} /* mysqlisthreadsafeverb */
+#endif /*FRONTIER_MYSQL*/
+
Modified: Frontier/branches/Conversant/Common/source/langsqlite.c
===================================================================
--- Frontier/branches/Conversant/Common/source/langsqlite.c 2009-05-29 16:18:06 UTC (rev 1805)
+++ Frontier/branches/Conversant/Common/source/langsqlite.c 2009-05-29 18:31:04 UTC (rev 1806)
@@ -44,8 +44,11 @@
#include "langexternal.h"
#include "langsqlite.h"
-#include <sqlite3.h>
+#ifdef FRONTIER_SQLITE
+
+#include "../sqlite3/sqlite3.h"
+
#ifdef MACVERSION
#include <sys/param.h>
@@ -60,6 +63,7 @@
#endif // WIN95VERSION
+#endif
/* Building SQLite into Frontier
@@ -125,7 +129,9 @@
setbooleanvalue (false, v); /* by default, sqlite functions return false */
switch (token) {
-
+
+#ifdef FRONTIER_SQLITE
+
case openfunc: { /* 2006-03-14 gewirtz: open an SQLite db */
return (sqliteopenverb (hp1, v, bserror));
@@ -209,6 +215,8 @@
return ( getlastinsertrowidverb ( hp1, v, bserror ) );
+#endif
+
default:
getstringlist (langerrorlist, unimplementedverberror, bserror);
@@ -227,6 +235,7 @@
return (loadfunctionprocessor (idsqliteverbs, &sqlitefunctionvalue));
} /* sqliteinitverbs */
+#ifdef FRONTIER_SQLITE
static void sqliteOpenError (const char *errmsg, bigstring bserror) {
bigstring bserrmsg;
@@ -1218,3 +1227,5 @@
} // getlastinsertrowidverb
+#endif /*FRONTIER_SQLITE*/
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
