[Libreoffice-commits] core.git: configure.ac download.lst external/libmariadb
Lionel Elie Mamane
lionel at mamane.lu
Mon Aug 11 04:52:36 PDT 2014
configure.ac | 6
download.lst | 2
external/libmariadb/UnpackedTarball_mariadb.mk | 1
external/libmariadb/mariadb-trunk-101.patch |242797 -------------------------
4 files changed, 3 insertions(+), 242803 deletions(-)
New commits:
commit 35836d2494d67d129f305e2294fc60fed062c9c7
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Mon Aug 11 13:03:27 2014 +0200
switch internal mariadb client to version 2
and reenable it: hopefully the worst bugs are fixed now
Change-Id: I8033ef87d02ba6619e5f778b5255fa803ba63c5b
diff --git a/configure.ac b/configure.ac
index 7126012..0e88287 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8244,12 +8244,11 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
if test "$with_system_mariadb" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_MARIADB=TRUE
- #AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
+ AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
if test -z "$MARIADBCONFIG"; then
AC_PATH_PROG(MARIADBCONFIG, [mysql_config])
if test -z "$MARIADBCONFIG"; then
- #AC_MSG_ERROR([mariadb_config and mysql_config are missing. Install MariaDB or MySQL package.])
- AC_MSG_ERROR([mysql_config is missing. Install MySQL client library development package.])
+ AC_MSG_ERROR([mariadb_config and mysql_config are missing. Install MariaDB or MySQL development package.])
fi
fi
AC_MSG_CHECKING([MariaDB version])
@@ -8302,7 +8301,6 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
fi
else
AC_MSG_RESULT([internal])
- AC_MSG_ERROR([libmariadb is known to be broken as of 2013-10; use libmysqlclient])
SYSTEM_MARIADB=
MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include"
MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib"
diff --git a/download.lst b/download.lst
index 36bc91f..1708e1a 100644
--- a/download.lst
+++ b/download.lst
@@ -94,7 +94,7 @@ export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.
export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz
export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
-export MARIADB_TARBALL := 05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2
+export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
export MDDS_TARBALL := aa5ca9d1ed1082890835afab26400a39-mdds_0.10.3.tar.bz2
export MSPUB_MD5SUM := 1d489c4932109e72495b1df8b69e5f11
export MSPUB_TARBALL := libmspub-0.1.1.tar.bz2
diff --git a/external/libmariadb/UnpackedTarball_mariadb.mk b/external/libmariadb/UnpackedTarball_mariadb.mk
index 489477c..c3c5ed4 100644
--- a/external/libmariadb/UnpackedTarball_mariadb.mk
+++ b/external/libmariadb/UnpackedTarball_mariadb.mk
@@ -28,7 +28,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,mariadb,1))
# non-static inline local_thr_alarm in libmariadb/net.c":
$(eval $(call gb_UnpackedTarball_add_patches,mariadb,\
external/libmariadb/mariadb-swap.patch \
- external/libmariadb/mariadb-trunk-101.patch \
external/libmariadb/mariadb-msvc.patch.1 \
))
diff --git a/external/libmariadb/mariadb-trunk-101.patch b/external/libmariadb/mariadb-trunk-101.patch
deleted file mode 100644
index 75cf434..0000000
--- a/external/libmariadb/mariadb-trunk-101.patch
+++ /dev/null
@@ -1,242797 +0,0 @@
-diff -x .bzr -u --recursive -N mariadb-native-client.release/cmake/CheckFunctions.cmake mariadb-native-client.trunk/cmake/CheckFunctions.cmake
---- mariadb/cmake/CheckFunctions.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ mariadb/cmake/CheckFunctions.cmake 2013-10-19 07:29:16.000000000 +0200
-@@ -0,0 +1,108 @@
-+# This file is included by CMakeLists.txt and
-+# checks for various functions.
-+# include/my_config.h.in
-+# You will find the appropiate defines in
-+
-+INCLUDE(CheckFunctionExists)
-+
-+CHECK_FUNCTION_EXISTS (access HAVE_ACCESS)
-+CHECK_FUNCTION_EXISTS (aiowait HAVE_AIOWAIT)
-+CHECK_FUNCTION_EXISTS (alarm HAVE_ALARM)
-+CHECK_FUNCTION_EXISTS (alloca HAVE_ALLOCA)
-+CHECK_FUNCTION_EXISTS (bcmp HAVE_BCMP)
-+CHECK_FUNCTION_EXISTS (bfill HAVE_BFILL)
-+CHECK_FUNCTION_EXISTS (bmove HAVE_BMOVE)
-+CHECK_FUNCTION_EXISTS (bzero HAVE_BZERO)
-+CHECK_FUNCTION_EXISTS (clock_gettime HAVE_CLOCK_GETTIME)
-+CHECK_FUNCTION_EXISTS (compress HAVE_COMPRESS)
-+CHECK_FUNCTION_EXISTS (crypt HAVE_CRYPT)
-+CHECK_FUNCTION_EXISTS (dlerror HAVE_DLERROR)
-+CHECK_FUNCTION_EXISTS (dlopen HAVE_DLOPEN)
-+CHECK_FUNCTION_EXISTS (fchmod HAVE_FCHMOD)
-+CHECK_FUNCTION_EXISTS (fcntl HAVE_FCNTL)
-+CHECK_FUNCTION_EXISTS (fconvert HAVE_FCONVERT)
-+CHECK_FUNCTION_EXISTS (fdatasync HAVE_FDATASYNC)
-+CHECK_FUNCTION_EXISTS (fesetround HAVE_FESETROUND)
-+CHECK_FUNCTION_EXISTS (finite HAVE_FINITE)
-+CHECK_FUNCTION_EXISTS (fseeko HAVE_FSEEKO)
-+CHECK_FUNCTION_EXISTS (fsync HAVE_FSYNC)
-+CHECK_FUNCTION_EXISTS (getaddrinfo HAVE_GETADDRINFO)
-+CHECK_FUNCTION_EXISTS (getcwd HAVE_GETCWD)
-+CHECK_FUNCTION_EXISTS (gethostbyaddr_r HAVE_GETHOSTBYADDR_R)
-+CHECK_FUNCTION_EXISTS (gethostbyname_r HAVE_GETHOSTBYNAME_R)
-+CHECK_FUNCTION_EXISTS (gethrtime HAVE_GETHRTIME)
-+CHECK_FUNCTION_EXISTS (getnameinfo HAVE_GETNAMEINFO)
-+CHECK_FUNCTION_EXISTS (getpagesize HAVE_GETPAGESIZE)
-+CHECK_FUNCTION_EXISTS (getpass HAVE_GETPASS)
-+CHECK_FUNCTION_EXISTS (getpassphrase HAVE_GETPASSPHRASE)
-+CHECK_FUNCTION_EXISTS (getpwnam HAVE_GETPWNAM)
-+CHECK_FUNCTION_EXISTS (getpwuid HAVE_GETPWUID)
-+CHECK_FUNCTION_EXISTS (getrlimit HAVE_GETRLIMIT)
-+CHECK_FUNCTION_EXISTS (getrusage HAVE_GETRUSAGE)
-+CHECK_FUNCTION_EXISTS (getwd HAVE_GETWD)
-+CHECK_FUNCTION_EXISTS (gmtime_r HAVE_GMTIME_R)
-+CHECK_FUNCTION_EXISTS (initgroups HAVE_INITGROUPS)
-+CHECK_FUNCTION_EXISTS (ldiv HAVE_LDIV)
-+CHECK_FUNCTION_EXISTS (localtime_r HAVE_LOCALTIME_R)
-+CHECK_FUNCTION_EXISTS (log2 HAVE_LOG2)
-+CHECK_FUNCTION_EXISTS (longjmp HAVE_LONGJMP)
-+CHECK_FUNCTION_EXISTS (lstat HAVE_LSTAT)
-+CHECK_FUNCTION_EXISTS (madvise HAVE_MADVISE)
-+CHECK_FUNCTION_EXISTS (mallinfo HAVE_MALLINFO)
-+CHECK_FUNCTION_EXISTS (memalign HAVE_MEMALIGN)
-+CHECK_FUNCTION_EXISTS (memcpy HAVE_MEMCPY)
-+CHECK_FUNCTION_EXISTS (memmove HAVE_MEMMOVE)
-+CHECK_FUNCTION_EXISTS (mkstemp HAVE_MKSTEMP)
-+CHECK_FUNCTION_EXISTS (mlock HAVE_MLOCK)
-+CHECK_FUNCTION_EXISTS (mlockall HAVE_MLOCKALL)
-+CHECK_FUNCTION_EXISTS (mmap HAVE_MMAP)
-+CHECK_FUNCTION_EXISTS (mmap64 HAVE_MMAP64)
-+CHECK_FUNCTION_EXISTS (perror HAVE_PERROR)
-+CHECK_FUNCTION_EXISTS (poll HAVE_POLL)
-+CHECK_FUNCTION_EXISTS (pread HAVE_PREAD)
-+CHECK_FUNCTION_EXISTS (pthread_attr_create HAVE_PTHREAD_ATTR_CREATE)
-+CHECK_FUNCTION_EXISTS (pthread_attr_getstacksize HAVE_PTHREAD_ATTR_GETSTACKSIZE)
-+CHECK_FUNCTION_EXISTS (pthread_attr_setprio HAVE_PTHREAD_ATTR_SETPRIO)
-+CHECK_FUNCTION_EXISTS (pthread_attr_setschedparam HAVE_PTHREAD_ATTR_SETSCHEDPARAM)
-+CHECK_FUNCTION_EXISTS (pthread_attr_setscope HAVE_PTHREAD_ATTR_SETSCOPE)
-+CHECK_FUNCTION_EXISTS (pthread_attr_setstacksize HAVE_PTHREAD_ATTR_SETSTACKSIZE)
-+CHECK_FUNCTION_EXISTS (pthread_condattr_create HAVE_PTHREAD_CONDATTR_CREATE)
-+CHECK_FUNCTION_EXISTS (pthread_init HAVE_PTHREAD_INIT)
-+CHECK_FUNCTION_EXISTS (pthread_key_delete HAVE_PTHREAD_KEY_DELETE)
-+CHECK_FUNCTION_EXISTS (pthread_kill HAVE_PTHREAD_KILL)
-+CHECK_FUNCTION_EXISTS (pthread_rwlock_rdlock HAVE_PTHREAD_RWLOCK_RDLOCK)
-+CHECK_FUNCTION_EXISTS (pthread_setprio_np HAVE_PTHREAD_SETPRIO_NP)
-+CHECK_FUNCTION_EXISTS (pthread_setschedparam HAVE_PTHREAD_SETSCHEDPARAM)
-+CHECK_FUNCTION_EXISTS (pthread_sigmask HAVE_PTHREAD_SIGMASK)
-+CHECK_FUNCTION_EXISTS (pthread_threadmask HAVE_PTHREAD_THREADMASK)
-+CHECK_FUNCTION_EXISTS (pthread_yield_np HAVE_PTHREAD_YIELD_NP)
-+CHECK_FUNCTION_EXISTS (readdir_r HAVE_READDIR_R)
-+CHECK_FUNCTION_EXISTS (readlink HAVE_READLINK)
-+CHECK_FUNCTION_EXISTS (realpath HAVE_REALPATH)
-+CHECK_FUNCTION_EXISTS (rename HAVE_RENAME)
-+CHECK_FUNCTION_EXISTS (sched_yield HAVE_SCHED_YIELD)
-+CHECK_FUNCTION_EXISTS (select HAVE_SELECT)
-+CHECK_FUNCTION_EXISTS (setfd HAVE_SETFD)
-+CHECK_FUNCTION_EXISTS (setfilepointer HAVE_SETFILEPOINTER)
-+CHECK_FUNCTION_EXISTS (sigaction HAVE_SIGACTION)
-+CHECK_FUNCTION_EXISTS (sigthreadmask HAVE_SIGTHREADMASK)
-+CHECK_FUNCTION_EXISTS (sigwait HAVE_SIGWAIT)
-+CHECK_FUNCTION_EXISTS (sleep HAVE_SLEEP)
-+CHECK_FUNCTION_EXISTS (snprintf HAVE_SNPRINTF)
-+CHECK_FUNCTION_EXISTS (stpcpy HAVE_STPCPY)
-+CHECK_FUNCTION_EXISTS (strerror HAVE_STRERROR)
-+CHECK_FUNCTION_EXISTS (strlcpy HAVE_STRLCPY)
-+CHECK_FUNCTION_EXISTS (strnlen HAVE_STRNLEN)
-+CHECK_FUNCTION_EXISTS (strpbrk HAVE_STRPBRK)
-+CHECK_FUNCTION_EXISTS (strsep HAVE_STRSEP)
-+CHECK_FUNCTION_EXISTS (strstr HAVE_STRSTR)
-+CHECK_FUNCTION_EXISTS (strtok_r HAVE_STRTOK_R)
-+CHECK_FUNCTION_EXISTS (strtol HAVE_STRTOL)
-+CHECK_FUNCTION_EXISTS (strtoll HAVE_STRTOLL)
-+CHECK_FUNCTION_EXISTS (strtoul HAVE_STRTOUL)
-+CHECK_FUNCTION_EXISTS (strtoull HAVE_STRTOULL)
-+CHECK_FUNCTION_EXISTS (tell HAVE_TELL)
-+CHECK_FUNCTION_EXISTS (thr_setconcurrency HAVE_THR_SETCONCURRENCY)
-+CHECK_FUNCTION_EXISTS (thr_yield HAVE_THR_YIELD)
-+CHECK_FUNCTION_EXISTS (vasprintf HAVE_VASPRINTF)
-+CHECK_FUNCTION_EXISTS (vsnprintf HAVE_VSNPRINTF)
-diff -x .bzr -u --recursive -N mariadb-native-client.release/cmake/CheckIncludeFiles.cmake mariadb-native-client.trunk/cmake/CheckIncludeFiles.cmake
---- mariadb/cmake/CheckIncludeFiles.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ mariadb/cmake/CheckIncludeFiles.cmake 2013-10-19 07:29:16.000000000 +0200
-@@ -0,0 +1,68 @@
-+# This file is included by CMakeLists.txt and
-+# checks for various header files.
-+# You will find the appropiate defines in
-+# include/my_config.h.in
-+
-+INCLUDE(CheckIncludeFiles)
-+
-+CHECK_INCLUDE_FILES (alloca.h HAVE_ALLOCA_H)
-+CHECK_INCLUDE_FILES (arpa/inet.h HAVE_ARPA_INET_H)
-+CHECK_INCLUDE_FILES (crypt.h HAVE_CRYPT_H)
-+CHECK_INCLUDE_FILES (dirent.h HAVE_DIRENT_H)
-+CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
-+CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H)
-+CHECK_INCLUDE_FILES (fcntl.h HAVE_FCNTL_H)
-+CHECK_INCLUDE_FILES (fenv.h HAVE_FENV_H)
-+CHECK_INCLUDE_FILES (float.h HAVE_FLOAT_H)
-+CHECK_INCLUDE_FILES (fpu/control.h HAVE_FPU_CONTROL_H)
-+CHECK_INCLUDE_FILES (grp.h HAVE_GRP_H)
-+CHECK_INCLUDE_FILES (ieeefp.h HAVE_IEEEFP_H)
-+CHECK_INCLUDE_FILES (limits.h HAVE_LIMITS_H)
-+CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
-+CHECK_INCLUDE_FILES (memory.h HAVE_MEMORY_H)
-+CHECK_INCLUDE_FILES (netinet/in.h HAVE_NETINET_IN_H)
-+CHECK_INCLUDE_FILES (paths.h HAVE_PATHS_H)
-+CHECK_INCLUDE_FILES (pwd.h HAVE_PWD_H)
-+CHECK_INCLUDE_FILES (sched.h HAVE_SCHED_H)
-+CHECK_INCLUDE_FILES (select.h HAVE_SELECT_H)
-+
-+CHECK_INCLUDE_FILES (signal.h INCLUDE_SIGNAL)
-+IF(INCLUDE_SIGNAL)
-+ SET(HAVE_SIGNAL 1)
-+ SET(CMAKE_EXTRA_INCLUDE_FILES signal.h)
-+ENDIF(INCLUDE_SIGNAL)
-+
-+CHECK_INCLUDE_FILES (stddef.h HAVE_STDDEF_H)
-+
-+CHECK_INCLUDE_FILES (stdint.h HAVE_STDINT_H)
-+IF(HAVE_STDINT_H)
-+ SET(CMAKE_EXTRA_INCLUDE_FILES stdint.h)
-+ENDIF(HAVE_STDINT_H)
-+
-+CHECK_INCLUDE_FILES (stdlib.h HAVE_STDLIB_H)
-+CHECK_INCLUDE_FILES (string.h HAVE_STRING_H)
-+CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)
-+CHECK_INCLUDE_FILES (synch.h HAVE_SYNCH_H)
-+CHECK_INCLUDE_FILES (sys/fpu.h HAVE_SYS_FPU_H)
-+CHECK_INCLUDE_FILES (sys/ioctl.h HAVE_SYS_IOCTL_H)
-+CHECK_INCLUDE_FILES (sys/ipc.h HAVE_SYS_IPC_H)
-+CHECK_INCLUDE_FILES (sys/mman.h HAVE_SYS_MMAN_H)
-+CHECK_INCLUDE_FILES (sys/prctl.h HAVE_SYS_PRCTL_H)
-+CHECK_INCLUDE_FILES (sys/select.h HAVE_SYS_SELECT_H)
-+CHECK_INCLUDE_FILES (sys/shm.h HAVE_SYS_SHM_H)
-+
-+CHECK_INCLUDE_FILES (sys/socket.h HAVE_SYS_SOCKET_H)
-+IF(HAVE_SYS_SOCKET_H)
-+ SET(CMAKE_EXTRA_INCLUDE_FILES sys/socket.h)
-+ENDIF(HAVE_SYS_SOCKET_H)
-+
-+CHECK_INCLUDE_FILES (sys/stat.h HAVE_SYS_STAT_H)
-+CHECK_INCLUDE_FILES (sys/stream.h HAVE_SYS_STREAM_H)
-+CHECK_INCLUDE_FILES (sys/timeb.h HAVE_SYS_TIMEB_H)
-+CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)
-+CHECK_INCLUDE_FILES (sys/un.h HAVE_SYS_UN_H)
-+CHECK_INCLUDE_FILES (sysent.h HAVE_SYSENT_H)
-+CHECK_INCLUDE_FILES (termio.h HAVE_TERMIO_H)
-+CHECK_INCLUDE_FILES (termios.h HAVE_TERMIOS_H)
-+CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
-+CHECK_INCLUDE_FILES (utime.h HAVE_UTIME_H)
-diff -x .bzr -u --recursive -N mariadb-native-client.release/cmake/CheckTypes.cmake mariadb-native-client.trunk/cmake/CheckTypes.cmake
---- mariadb/cmake/CheckTypes.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ mariadb/cmake/CheckTypes.cmake 2013-10-19 07:29:16.000000000 +0200
-@@ -0,0 +1,106 @@
-+# This file is included by CMakeLists.txt and
-+# checks for type sizes.
-+# You will find the appropiate defines in
-+# include/my_config.h.in
-+INCLUDE (CheckTypeSize)
-+
-+SET(CMAKE_EXTRA_INCLUDE_FILES signal.h)
-+CHECK_TYPE_SIZE(sigset_t SIZEOF_SIGSET_T)
-+CHECK_TYPE_SIZE(char SIZEOF_CHAR)
-+CHECK_TYPE_SIZE("char *" SIZEOF_CHARP)
-+CHECK_TYPE_SIZE(short SIZEOF_SHORT)
-+CHECK_TYPE_SIZE(int SIZEOF_INT)
-+CHECK_TYPE_SIZE(long SIZEOF_LONG)
-+CHECK_TYPE_SIZE("long long" SIZEOF_LONG_LONG)
-+SET(CMAKE_EXTRA_INCLUDE_FILES stdio.h)
-+CHECK_TYPE_SIZE(size_t SIZEOF_SIZE_T)
-+SET(CMAKE_EXTRA_INCLUDE_FILES sys/types.h)
-+CHECK_TYPE_SIZE(off_t SIZEOF_OFF_T)
-+CHECK_TYPE_SIZE(uchar SIZEOF_UCHAR)
-+CHECK_TYPE_SIZE(uint SIZEOF_UINT)
-+CHECK_TYPE_SIZE(ulong SIZEOF_ULONG)
-+CHECK_TYPE_SIZE(int8 SIZEOF_INT8)
-+CHECK_TYPE_SIZE(uint8 SIZEOF_UINT8)
-+CHECK_TYPE_SIZE(int16 SIZEOF_INT16)
-+CHECK_TYPE_SIZE(uint16 SIZEOF_UINT16)
-+CHECK_TYPE_SIZE(int32 SIZEOF_INT32)
-+CHECK_TYPE_SIZE(uint32 SIZEOF_UINT32)
-+CHECK_TYPE_SIZE(u_int32_t SIZEOF_UINT_32_T)
-+CHECK_TYPE_SIZE(int64 SIZEOF_INT64)
-+CHECK_TYPE_SIZE(uint64 SIZEOF_UINT64)
-+CHECK_TYPE_SIZE(socklen_t SIZEOF_SOCKLEN_T)
-+
-+#
-+# Compile testing
-+#
-+INCLUDE (CheckCSourceCompiles)
-+
-+#
-+# signal handler
-+#
-+CHECK_C_SOURCE_COMPILES("
-+ #include <signal.h>
-+
-+ #ifdef signal
-+ #undef signal
-+ #endif
-+
-+ #ifdef __cplusplus
-+ extern \"C\" void (*signal (int, void (*)(int)))(int);
-+ #else
-+ void (*signal ()) ();
-+ #endif
-+
-+ int main(int ac, char **av)
-+ {
-+ }"
-+ IS_VOID_SIGNAL)
-+
-+IF(IS_VOID_SIGNAL)
-+ SET(RETSIGTYPE "void")
-+ELSE(IS_VOID_SIGNAL)
-+ SET(RETSIGTYPE "int")
-+ENDIF(IS_VOID_SIGNAL)
-+
-+#
-+# quick sort
-+#
-+CHECK_C_SOURCE_COMPILES("
-+ #include <stdlib.h>
-+ #ifdef __cplusplus
-+ extern \"C\" void qsort(void *base, size_t nel, size_t width, int (*compar) (const void *, const void *));
-+ #else
-+ void qsort(void *base, size_t nel, size_t width, int (*compar) (const void *, const void *));
-+ #endif
-+ int main(int ac, char **av)
-+ {
-+ }"
-+ IS_VOID_QSORT)
-+IF(IS_VOID_QSORT)
-+ SET(RETQSORTTYPE "void")
-+ELSE(IS_VOID_QSORT)
-+ SET(RETQSORTTYPE "int")
-+ENDIF(IS_VOID_QSORT)
-+
-+#
-+# SOCKET_SIZE
-+#
-+IF(WIN32)
-+ SET(SOCKET_SIZE_TYPE int)
-+ELSE(WIN32)
-+ FOREACH(CHECK_TYPE "socklen_t" "size_t" "int")
-+ IF (NOT SOCKET_SIZE_TYPE)
-+ CHECK_C_SOURCE_COMPILES("
-+ #include <sys/socket.h>
-+ int main(int argc, char **argv)
-+ {
-+ getsockname(0, 0, (${CHECK_TYPE} *)0);
-+ return 0;
-+ }"
-+ SOCKET_SIZE_FOUND_${CHECK_TYPE})
-+ IF(SOCKET_SIZE_FOUND_${CHECK_TYPE})
-+ SET(SOCKET_SIZE_TYPE ${CHECK_TYPE})
-+ ENDIF(SOCKET_SIZE_FOUND_${CHECK_TYPE})
-+ ENDIF (NOT SOCKET_SIZE_TYPE)
-+ ENDFOREACH()
-+ENDIF(WIN32)
-diff -x .bzr -u --recursive -N mariadb-native-client.release/cmake/FindIconv.cmake mariadb-native-client.trunk/cmake/FindIconv.cmake
---- mariadb/cmake/FindIconv.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ mariadb/cmake/FindIconv.cmake 2013-10-19 07:29:16.000000000 +0200
-@@ -0,0 +1,52 @@
-+# Copyright (c) 2010 Michael Bell <michael.bell at web.de>
-+
-+if (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-+ # Already in cache, be silent
-+ set(ICONV_FIND_QUIETLY TRUE)
-+endif (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-+
-+find_path(ICONV_INCLUDE_DIR iconv.h)
-+
-+find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c)
-+
-+if (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-+ set (ICONV_FOUND TRUE)
-+endif (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES)
-+
-+set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
-+set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
-+
-+if (ICONV_FOUND)
-+ include(CheckCSourceCompiles)
-+ CHECK_C_SOURCE_COMPILES("
-+ #include <iconv.h>
-+ int main(){
-+ iconv_t conv = 0;
-+ const char* in = 0;
-+ size_t ilen = 0;
-+ char* out = 0;
-+ size_t olen = 0;
-+ iconv(conv, &in, &ilen, &out, &olen);
-+ return 0;
-+ }
-+" ICONV_SECOND_ARGUMENT_IS_CONST )
-+endif (ICONV_FOUND)
-+
-+set (CMAKE_REQUIRED_INCLUDES)
-+set (CMAKE_REQUIRED_LIBRARIES)
-+
-+if (ICONV_FOUND)
-+ if (NOT ICONV_FIND_QUIETLY)
-+ message (STATUS "Found Iconv: ${ICONV_LIBRARIES}")
-+ endif (NOT ICONV_FIND_QUIETLY)
-+else (ICONV_FOUND)
-+ if (Iconv_FIND_REQUIRED)
-+ message (FATAL_ERROR "Could not find Iconv")
-+ endif (Iconv_FIND_REQUIRED)
-+endif (ICONV_FOUND)
-+
-+MARK_AS_ADVANCED(
-+ ICONV_INCLUDE_DIR
-+ ICONV_LIBRARIES
-+ ICONV_SECOND_ARGUMENT_IS_CONST
-+)
-diff -x .bzr -u --recursive -N mariadb-native-client.release/cmake/SearchLibrary.cmake mariadb-native-client.trunk/cmake/SearchLibrary.cmake
---- mariadb/cmake/SearchLibrary.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ mariadb/cmake/SearchLibrary.cmake 2013-10-19 07:29:16.000000000 +0200
-@@ -0,0 +1,23 @@
-+INCLUDE(CheckFunctionExists)
-+INCLUDE(CheckLibraryExists)
-+
-+FUNCTION(SEARCH_LIBRARY library_name function liblist)
-+ IF(${${library_name}})
-+ RETURN()
-+ ENDIF()
-+ CHECK_FUNCTION_EXISTS(${function} HAVE_${function}_IN_LIBC)
-+ # check if function is part of libc
-+ IF(HAVE_${function}_IN_LIBC)
-+ SET(${library_name} "" PARENT_SCOPE)
-+ RETURN()
-+ ENDIF()
-+ FOREACH(lib ${liblist})
-+ CHECK_LIBRARY_EXISTS(${lib} ${function} "" HAVE_${function}_IN_${lib})
-+ IF(HAVE_${function}_IN_${lib})
-+ SET(${library_name} ${lib} PARENT_SCOPE)
-+ SET(HAVE_${library_name} 1 PARENT_SCOPE)
-+ RETURN()
-+ ENDIF()
-+ ENDFOREACH()
-+ENDFUNCTION()
-+
-diff -x .bzr -u --recursive -N mariadb-native-client.release/cmake/WindowsCache.cmake mariadb-native-client.trunk/cmake/WindowsCache.cmake
---- mariadb/cmake/WindowsCache.cmake 1970-01-01 01:00:00.000000000 +0100
-+++ mariadb/cmake/WindowsCache.cmake 2013-10-19 07:29:16.000000000 +0200
-@@ -0,0 +1,392 @@
-+IF(MSVC)
-+SET(BFD_H_EXISTS 0 CACHE INTERNAL "")
-+SET(HAVE_ACCESS 1 CACHE INTERNAL "")
-+SET(HAVE_AIO_H CACHE INTERNAL "")
-+SET(HAVE_AIO_READ CACHE INTERNAL "")
-+SET(HAVE_ALARM CACHE INTERNAL "")
-+SET(HAVE_ALLOCA_H CACHE INTERNAL "")
-+SET(HAVE_ARPA_INET_H CACHE INTERNAL "")
-+SET(HAVE_ASM_MSR_H CACHE INTERNAL "")
-+SET(HAVE_BACKTRACE CACHE INTERNAL "")
-+SET(HAVE_BACKTRACE_SYMBOLS CACHE INTERNAL "")
-+SET(HAVE_BACKTRACE_SYMBOLS_FD CACHE INTERNAL "")
-+SET(HAVE_BFILL CACHE INTERNAL "")
-+SET(HAVE_BMOVE CACHE INTERNAL "")
-+SET(HAVE_BSD_SIGNALS CACHE INTERNAL "")
-+SET(HAVE_BSEARCH 1 CACHE INTERNAL "")
-+SET(HAVE_BSS_START CACHE INTERNAL "")
-+SET(HAVE_BZERO CACHE INTERNAL "")
-+SET(HAVE_CHOWN CACHE INTERNAL "")
-+SET(HAVE_CLOCK_GETTIME CACHE INTERNAL "")
-+SET(HAVE_COMPRESS CACHE INTERNAL "")
-+SET(HAVE_CRYPT CACHE INTERNAL "")
-+SET(HAVE_CRYPT_H CACHE INTERNAL "")
-+SET(HAVE_CUSERID CACHE INTERNAL "")
-+SET(HAVE_CXX_NEW 1 CACHE INTERNAL "")
-+SET(HAVE_DECL_MADVISE CACHE INTERNAL "")
-+SET(HAVE_DIRECTIO CACHE INTERNAL "")
-+SET(HAVE_DIRENT_H CACHE INTERNAL "")
-+SET(HAVE_DLERROR CACHE INTERNAL "")
-+SET(HAVE_DLFCN_H CACHE INTERNAL "")
-+SET(HAVE_DLOPEN CACHE INTERNAL "")
-+SET(HAVE_DOPRNT CACHE INTERNAL "")
-+SET(HAVE_EXECINFO_H CACHE INTERNAL "")
-+SET(HAVE_FCHMOD CACHE INTERNAL "")
-+SET(HAVE_FCNTL CACHE INTERNAL "")
-+SET(HAVE_FCNTL_H 1 CACHE INTERNAL "")
-+SET(HAVE_FCNTL_NONBLOCK CACHE INTERNAL "")
-+SET(HAVE_FCONVERT CACHE INTERNAL "")
-+SET(HAVE_FDATASYNC CACHE INTERNAL "")
-+SET(HAVE_DECL_FDATASYNC CACHE INTERNAL "")
-+SET(HAVE_FEDISABLEEXCEPT CACHE INTERNAL "")
-+SET(HAVE_FENV_H CACHE INTERNAL "")
-+SET(HAVE_FESETROUND CACHE INTERNAL "")
-+SET(HAVE_FGETLN CACHE INTERNAL "")
-+SET(HAVE_FINITE CACHE INTERNAL "")
-+SET(HAVE_FINITE_IN_MATH_H CACHE INTERNAL "")
-+SET(HAVE_FLOATINGPOINT_H CACHE INTERNAL "")
-+SET(HAVE_FLOAT_H 1 CACHE INTERNAL "")
-+SET(HAVE_FLOCKFILE CACHE INTERNAL "")
-+SET(HAVE_FNMATCH_H CACHE INTERNAL "")
-+SET(HAVE_FPSETMASK CACHE INTERNAL "")
-+SET(HAVE_FPU_CONTROL_H CACHE INTERNAL "")
-+SET(HAVE_FSEEKO CACHE INTERNAL "")
-+SET(HAVE_FSYNC CACHE INTERNAL "")
-+SET(HAVE_FTIME 1 CACHE INTERNAL "")
-+SET(HAVE_FTRUNCATE CACHE INTERNAL "")
-+SET(HAVE_GETADDRINFO 1 CACHE INTERNAL "")
-+SET(HAVE_GETCWD 1 CACHE INTERNAL "")
-+SET(HAVE_GETHOSTBYADDR_R CACHE INTERNAL "")
-+SET(HAVE_GETHRTIME CACHE INTERNAL "")
-+SET(HAVE_GETLINE CACHE INTERNAL "")
-+SET(HAVE_GETNAMEINFO CACHE INTERNAL "")
-+SET(HAVE_GETPAGESIZE CACHE INTERNAL "")
-+SET(HAVE_GETPASS CACHE INTERNAL "")
-+SET(HAVE_GETPASSPHRASE CACHE INTERNAL "")
-+SET(HAVE_GETPWNAM CACHE INTERNAL "")
-+SET(HAVE_GETPWUID CACHE INTERNAL "")
-+SET(HAVE_GETRLIMIT CACHE INTERNAL "")
-+SET(HAVE_GETRUSAGE CACHE INTERNAL "")
-+SET(HAVE_GETTIMEOFDAY CACHE INTERNAL "")
-+SET(HAVE_GETWD CACHE INTERNAL "")
-+SET(HAVE_GMTIME_R CACHE INTERNAL "")
-+SET(HAVE_GRP_H CACHE INTERNAL "")
-+SET(HAVE_IA64INTRIN_H CACHE INTERNAL "")
-+SET(HAVE_IEEEFP_H CACHE INTERNAL "")
-+SET(HAVE_INDEX CACHE INTERNAL "")
-+SET(HAVE_INITGROUPS CACHE INTERNAL "")
-+SET(HAVE_INTTYPES_H CACHE INTERNAL "")
-+SET(HAVE_IPPROTO_IPV6 CACHE INTERNAL "")
-+SET(HAVE_IPV6 TRUE CACHE INTERNAL "")
-+SET(HAVE_IPV6_V6ONLY 1 CACHE INTERNAL "")
-+SET(HAVE_ISINF CACHE INTERNAL "")
-+SET(HAVE_ISNAN CACHE INTERNAL "")
-+SET(HAVE_ISSETUGID CACHE INTERNAL "")
-+SET(HAVE_GETUID CACHE INTERNAL "")
-+SET(HAVE_GETEUID CACHE INTERNAL "")
-+SET(HAVE_GETGID CACHE INTERNAL "")
-+SET(HAVE_GETEGID CACHE INTERNAL "")
-+SET(HAVE_LANGINFO_H CACHE INTERNAL "")
-+SET(HAVE_LDIV 1 CACHE INTERNAL "")
-+SET(HAVE_LIMITS_H 1 CACHE INTERNAL "")
-+SET(HAVE_LOCALE_H 1 CACHE INTERNAL "")
-+SET(HAVE_LOCALTIME_R CACHE INTERNAL "")
-+SET(HAVE_LOG2 CACHE INTERNAL "")
-+SET(HAVE_LONGJMP 1 CACHE INTERNAL "")
-+SET(HAVE_LRAND48 CACHE INTERNAL "")
-+SET(HAVE_LSTAT CACHE INTERNAL "")
-+SET(HAVE_MADVISE CACHE INTERNAL "")
-+SET(HAVE_MALLINFO CACHE INTERNAL "")
-+SET(HAVE_MALLOC_H 1 CACHE INTERNAL "")
-+SET(HAVE_MEMALIGN CACHE INTERNAL "")
-+SET(HAVE_MEMCPY 1 CACHE INTERNAL "")
-+SET(HAVE_MEMMOVE 1 CACHE INTERNAL "")
-+SET(HAVE_MEMORY_H 1 CACHE INTERNAL "")
-+SET(HAVE_MKSTEMP CACHE INTERNAL "")
-+SET(HAVE_MLOCK CACHE INTERNAL "")
-+SET(HAVE_MLOCKALL CACHE INTERNAL "")
-+SET(HAVE_MMAP CACHE INTERNAL "")
-+SET(HAVE_MMAP64 CACHE INTERNAL "")
-+SET(HAVE_NETDB_H CACHE INTERNAL "")
-+SET(HAVE_NETINET_IN6_H CACHE INTERNAL "")
-+SET(HAVE_NETINET_IN_H CACHE INTERNAL "")
-+SET(HAVE_NL_LANGINFO CACHE INTERNAL "")
-+SET(HAVE_PASE_ENVIRONMENT CACHE INTERNAL "")
-+SET(HAVE_PATHS_H CACHE INTERNAL "")
-+SET(HAVE_PCLOSE CACHE INTERNAL "")
-+SET(HAVE_PERROR 1 CACHE INTERNAL "")
-+SET(HAVE_PEERCRED CACHE INTERNAL "")
-+SET(HAVE_PAM_APPL_H CACHE INTERNAL "")
-+SET(HAVE_POLL_H CACHE INTERNAL "")
-+SET(HAVE_POPEN CACHE INTERNAL "")
-+SET(HAVE_POLL CACHE INTERNAL "")
-+SET(HAVE_PORT_CREATE CACHE INTERNAL "")
-+SET(HAVE_PORT_H CACHE INTERNAL "")
-+SET(HAVE_POSIX_FALLOCATE CACHE INTERNAL "")
-+SET(HAVE_POSIX_SIGNALS CACHE INTERNAL "")
-+SET(HAVE_PREAD CACHE INTERNAL "")
-+SET(HAVE_PRINTSTACK CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_ATTR_CREATE CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_ATTR_GETSTACKSIZE CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_ATTR_SETSCOPE CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_ATTR_SETSTACKSIZE CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_CONDATTR_CREATE CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_CONDATTR_SETCLOCK CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_INIT CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_KEY_DELETE CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_RWLOCK_RDLOCK CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_SIGMASK CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_THREADMASK CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_YIELD_NP CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_YIELD_ZERO_ARG CACHE INTERNAL "")
-+SET(HAVE_PUTENV 1 CACHE INTERNAL "")
-+SET(HAVE_PWD_H CACHE INTERNAL "")
-+SET(HAVE_RDTSCLL CACHE INTERNAL "")
-+SET(HAVE_READDIR_R CACHE INTERNAL "")
-+SET(HAVE_READLINK CACHE INTERNAL "")
-+SET(HAVE_READ_REAL_TIME CACHE INTERNAL "")
-+SET(HAVE_REALPATH CACHE INTERNAL "")
-+SET(HAVE_REGCOMP CACHE INTERNAL "")
-+SET(HAVE_RENAME 1 CACHE INTERNAL "")
-+SET(HAVE_RE_COMP CACHE INTERNAL "")
-+SET(HAVE_RINT CACHE INTERNAL "")
-+SET(HAVE_RWLOCK_INIT CACHE INTERNAL "")
-+SET(HAVE_SCHED_H CACHE INTERNAL "")
-+SET(HAVE_SCHED_YIELD CACHE INTERNAL "")
-+SET(HAVE_SELECT 1 CACHE INTERNAL "")
-+SET(HAVE_SELECT_H CACHE INTERNAL "")
-+SET(HAVE_SEMAPHORE_H CACHE INTERNAL "")
-+SET(HAVE_SETENV CACHE INTERNAL "")
-+SET(HAVE_SETFD CACHE INTERNAL "")
-+SET(HAVE_SETLOCALE 1 CACHE INTERNAL "")
-+SET(HAVE_SHMAT CACHE INTERNAL "")
-+SET(HAVE_SHMCTL CACHE INTERNAL "")
-+SET(HAVE_SHMDT CACHE INTERNAL "")
-+SET(HAVE_SHMGET CACHE INTERNAL "")
-+SET(HAVE_SIGACTION CACHE INTERNAL "")
-+SET(HAVE_SIGADDSET CACHE INTERNAL "")
-+SET(HAVE_SIGEMPTYSET CACHE INTERNAL "")
-+SET(HAVE_SIGHOLD CACHE INTERNAL "")
-+SET(HAVE_SIGINT 1 CACHE INTERNAL "")
-+SET(HAVE_SIGPIPE CACHE INTERNAL "")
-+SET(HAVE_SIGQUIT CACHE INTERNAL "")
-+SET(HAVE_SIGSET CACHE INTERNAL "")
-+SET(HAVE_SIGTERM 1 CACHE INTERNAL "")
-+SET(HAVE_SIGTHREADMASK CACHE INTERNAL "")
-+SET(HAVE_SIGWAIT CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_BOOL FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_CHAR TRUE CACHE INTERNAL "")
-+SET(SIZEOF_CHAR 1 CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_CHARP TRUE CACHE INTERNAL "")
-+SET(SIZEOF_CHARP ${CMAKE_SIZEOF_VOID_P} CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_IN6_ADDR TRUE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_INT TRUE CACHE INTERNAL "")
-+SET(SIZEOF_INT 4 CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_INT16 FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_INT32 FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_INT64 FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_INT8 FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_LONG TRUE CACHE INTERNAL "")
-+SET(SIZEOF_LONG 4 CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_LONG_LONG TRUE CACHE INTERNAL "")
-+SET(SIZEOF_LONG_LONG 8 CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_MODE_T FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_OFF_T TRUE CACHE INTERNAL "")
-+SET(SIZEOF_OFF_T 4 CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_SHORT TRUE CACHE INTERNAL "")
-+SET(SIZEOF_SHORT 2 CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_SIGSET_T FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_SIZE_T TRUE CACHE INTERNAL "")
-+SET(SIZEOF_SIZE_T ${CMAKE_SIZEOF_VOID_P} CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_SOCKADDR_IN6 TRUE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_SOCKLEN_T FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_UCHAR FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_UINT FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_UINT16 FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_UINT32 FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_UINT64 FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_UINT8 FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_ULONG FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZEOF_U_INT32_T FALSE CACHE INTERNAL "")
-+SET(HAVE_SIZE_OF_SSIZE_T FALSE CACHE INTERNAL "")
-+SET(HAVE_SLEEP CACHE INTERNAL "")
-+SET(HAVE_SNPRINTF CACHE INTERNAL "")
-+SET(HAVE_SOCKADDR_STORAGE_SS_FAMILY 1 CACHE INTERNAL "")
-+SET(HAVE_SOLARIS_STYLE_GETHOST CACHE INTERNAL "")
-+SET(STACK_DIRECTION -1 CACHE INTERNAL "")
-+SET(HAVE_STDARG_H 1 CACHE INTERNAL "")
-+SET(HAVE_STDDEF_H 1 CACHE INTERNAL "")
-+SET(HAVE_STDINT_H CACHE INTERNAL "")
-+SET(HAVE_STDLIB_H 1 CACHE INTERNAL "")
-+SET(HAVE_STPCPY CACHE INTERNAL "")
-+SET(HAVE_STRCASECMP CACHE INTERNAL "")
-+SET(HAVE_STRCOLL 1 CACHE INTERNAL "")
-+SET(HAVE_STRDUP 1 CACHE INTERNAL "")
-+SET(HAVE_STRERROR 1 CACHE INTERNAL "")
-+SET(HAVE_STRINGS_H CACHE INTERNAL "")
-+SET(HAVE_STRING_H 1 CACHE INTERNAL "")
-+SET(HAVE_STRLCAT CACHE INTERNAL "")
-+SET(HAVE_STRLCPY CACHE INTERNAL "")
-+SET(HAVE_STRNCASECMP CACHE INTERNAL "")
-+SET(HAVE_STRNDUP CACHE INTERNAL "")
-+IF(MSVC_VERSION GREATER 1310)
-+SET(HAVE_STRNLEN 1 CACHE INTERNAL "")
-+ENDIF()
-+SET(HAVE_STRPBRK 1 CACHE INTERNAL "")
-+SET(HAVE_STRSEP CACHE INTERNAL "")
-+SET(HAVE_STRSIGNAL CACHE INTERNAL "")
-+SET(HAVE_STRSTR 1 CACHE INTERNAL "")
-+SET(HAVE_STRTOK_R CACHE INTERNAL "")
-+SET(HAVE_STRTOL 1 CACHE INTERNAL "")
-+SET(HAVE_STRTOLL CACHE INTERNAL "")
-+SET(HAVE_STRTOUL 1 CACHE INTERNAL "")
-+SET(HAVE_STRTOULL CACHE INTERNAL "")
-+SET(HAVE_SVR3_SIGNALS CACHE INTERNAL "")
-+SET(HAVE_SYNCH_H CACHE INTERNAL "")
-+SET(HAVE_SYSENT_H CACHE INTERNAL "")
-+SET(HAVE_SYS_CDEFS_H CACHE INTERNAL "")
-+SET(HAVE_SYS_DIR_H CACHE INTERNAL "")
-+SET(HAVE_SYS_ERRLIST CACHE INTERNAL "")
-+SET(HAVE_SYS_FILE_H CACHE INTERNAL "")
-+SET(HAVE_SYS_FPU_H CACHE INTERNAL "")
-+SET(HAVE_SYS_IOCTL_H CACHE INTERNAL "")
-+SET(HAVE_SYS_IPC_H CACHE INTERNAL "")
-+SET(HAVE_SYS_MALLOC_H CACHE INTERNAL "")
-+SET(HAVE_SYS_MMAN_H CACHE INTERNAL "")
-+SET(HAVE_SYS_PARAM_H CACHE INTERNAL "")
-+SET(HAVE_SYS_PRCTL_H CACHE INTERNAL "")
-+SET(HAVE_SYS_PTEM_H CACHE INTERNAL "")
-+SET(HAVE_SYS_PTE_H CACHE INTERNAL "")
-+SET(HAVE_SYS_RESOURCE_H CACHE INTERNAL "")
-+SET(HAVE_SYS_SELECT_H CACHE INTERNAL "")
-+SET(HAVE_SYS_SHM_H CACHE INTERNAL "")
-+SET(HAVE_SYS_SOCKIO_H CACHE INTERNAL "")
-+SET(HAVE_SYS_SOCKET_H CACHE INTERNAL "")
-+SET(HAVE_SYS_STAT_H 1 CACHE INTERNAL "")
-+SET(HAVE_SYS_STREAM_H CACHE INTERNAL "")
-+SET(HAVE_SYS_TERMCAP_H CACHE INTERNAL "")
-+SET(HAVE_SYS_TIMEB_H 1 CACHE INTERNAL "")
-+SET(HAVE_SYS_TIMES_H CACHE INTERNAL "")
-+SET(HAVE_SYS_TIME_H CACHE INTERNAL "")
-+SET(HAVE_SYS_TYPES_H 1 CACHE INTERNAL "")
-+SET(HAVE_SYS_UN_H CACHE INTERNAL "")
-+SET(HAVE_SYS_UTIME_H 1 CACHE INTERNAL "")
-+SET(HAVE_SYS_VADVISE_H CACHE INTERNAL "")
-+SET(HAVE_SYS_WAIT_H CACHE INTERNAL "")
-+SET(HAVE_TCGETATTR CACHE INTERNAL "")
-+SET(HAVE_TELL 1 CACHE INTERNAL "")
-+SET(HAVE_TEMPNAM 1 CACHE INTERNAL "")
-+SET(HAVE_TERMCAP_H CACHE INTERNAL "")
-+SET(HAVE_TERMIOS_H CACHE INTERNAL "")
-+SET(HAVE_TERMIO_H CACHE INTERNAL "")
-+SET(HAVE_TERM_H CACHE INTERNAL "")
-+SET(HAVE_THR_SETCONCURRENCY CACHE INTERNAL "")
-+SET(HAVE_THR_YIELD CACHE INTERNAL "")
-+SET(HAVE_TIME 1 CACHE INTERNAL "")
-+SET(HAVE_TIMES CACHE INTERNAL "")
-+SET(HAVE_TIMESPEC_TS_SEC CACHE INTERNAL "")
-+SET(HAVE_TIME_H 1 CACHE INTERNAL "")
-+SET(HAVE_TZNAME 1 CACHE INTERNAL "")
-+SET(HAVE_UNISTD_H CACHE INTERNAL "")
-+SET(HAVE_UTIME_H CACHE INTERNAL "")
-+SET(HAVE_VALLOC CACHE INTERNAL "")
-+SET(HAVE_VARARGS_H 1 CACHE INTERNAL "")
-+SET(HAVE_VASPRINTF CACHE INTERNAL "")
-+SET(HAVE_VPRINTF 1 CACHE INTERNAL "")
-+IF(MSVC_VERSION GREATER 1310)
-+SET(HAVE_VSNPRINTF 1 CACHE INTERNAL "")
-+ENDIF()
-+SET(HAVE_WEAK_SYMBOL CACHE INTERNAL "")
-+SET(HAVE_WORDS_BIGENDIAN TRUE CACHE INTERNAL "")
-+SET(WORDS_BIGENDIAN CACHE INTERNAL "")
-+SET(HAVE__S_IFIFO 1 CACHE INTERNAL "")
-+SET(HAVE__S_IREAD 1 CACHE INTERNAL "")
-+SET(HAVE__finite 1 CACHE INTERNAL "")
-+SET(HAVE__isnan 1 CACHE INTERNAL "")
-+SET(HAVE__pclose 1 CACHE INTERNAL "")
-+SET(HAVE__popen 1 CACHE INTERNAL "")
-+SET(HAVE__snprintf 1 CACHE INTERNAL "")
-+SET(HAVE__stricmp 1 CACHE INTERNAL "")
-+SET(HAVE__strnicmp 1 CACHE INTERNAL "")
-+SET(HAVE__strtoi64 1 CACHE INTERNAL "")
-+SET(HAVE__strtoui64 1 CACHE INTERNAL "")
-+IF(MSVC_VERSION GREATER 1310)
-+ SET(HAVE_strtok_s 1 CACHE INTERNAL "")
-+ENDIF()
-+SET(STDC_HEADERS CACHE 1 INTERNAL "")
-+SET(STRUCT_DIRENT_HAS_D_INO CACHE INTERNAL "")
-+SET(STRUCT_DIRENT_HAS_D_INO CACHE INTERNAL "")
-+SET(STRUCT_DIRENT_HAS_D_NAMLEN CACHE INTERNAL "")
-+SET(TIME_WITH_SYS_TIME CACHE INTERNAL "")
-+SET(TIME_T_UNSIGNED 1 CACHE INTERNAL "")
-+SET(TIOCSTAT_IN_SYS_IOCTL CACHE INTERNAL "")
-+SET(HAVE_S_IROTH CACHE INTERNAL "")
-+SET(HAVE_S_IFIFO CACHE INTERNAL "")
-+SET(QSORT_TYPE_IS_VOID 1 CACHE INTERNAL "")
-+SET(SIGNAL_RETURN_TYPE_IS_VOID 1 CACHE INTERNAL "")
-+SET(C_HAS_inline CACHE INTERNAL "")
-+SET(C_HAS___inline 1 CACHE INTERNAL "")
-+SET(FIONREAD_IN_SYS_IOCTL CACHE INTERNAL "")
-+SET(FIONREAD_IN_SYS_FILIO CACHE INTERNAL "")
-+SET(GWINSZ_IN_SYS_IOCTL CACHE INTERNAL "")
-+SET(HAVE_CXXABI_H CACHE INTERNAL "")
-+SET(HAVE_NDIR_H CACHE INTERNAL "")
-+SET(HAVE_SYS_NDIR_H CACHE INTERNAL "")
-+SET(HAVE_SYS_NDIR_H CACHE INTERNAL "")
-+SET(HAVE_ASM_TERMBITS_H CACHE INTERNAL "")
-+SET(HAVE_TERMBITS_H CACHE INTERNAL "")
-+SET(HAVE_VIS_H CACHE INTERNAL "")
-+SET(HAVE_WCHAR_H 1 CACHE INTERNAL "")
-+SET(HAVE_WCTYPE_H 1 CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_RWLOCKATTR_SETKIND_NP CACHE INTERNAL "")
-+SET(HAVE_SOCKADDR_IN_SIN_LEN CACHE INTERNAL "")
-+SET(HAVE_SOCKADDR_IN6_SIN6_LEN CACHE INTERNAL "")
-+SET(HAVE_VALGRIND CACHE INTERNAL "")
-+SET(HAVE_EVENT_H CACHE INTERNAL "")
-+SET(HAVE_LINUX_UNISTD_H CACHE INTERNAL "")
-+SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "")
-+SET(FIONREAD_IN_SYS_FILIO CACHE INTERNAL "")
-+SET(FIONREAD_IN_SYS_IOCTL CACHE INTERNAL "")
-+SET(GWINSZ_IN_SYS_IOCTL CACHE INTERNAL "")
-+SET(HAVE_ACCESS 1 CACHE INTERNAL "")
-+SET(HAVE_AIOWAIT CACHE INTERNAL "")
-+SET(HAVE_AIO_H CACHE INTERNAL "")
-+SET(HAVE_AIO_READ CACHE INTERNAL "")
-+SET(HAVE_ALARM CACHE INTERNAL "")
-+SET(HAVE_ALLOCA CACHE INTERNAL "")
-+SET(HAVE_ALLOCA_H CACHE INTERNAL "")
-+SET(HAVE_ARPA_INET_H CACHE INTERNAL "")
-+SET(HAVE_ASM_MSR_H CACHE INTERNAL "")
-+SET(HAVE_ASM_TERMBITS_H CACHE INTERNAL "")
-+SET(HAVE_BACKTRACE CACHE INTERNAL "")
-+SET(HAVE_BACKTRACE_SYMBOLS CACHE INTERNAL "")
-+SET(HAVE_BACKTRACE_SYMBOLS_FD CACHE INTERNAL "")
-+SET(HAVE_BCMP CACHE INTERNAL "")
-+SET(HAVE_BFILL CACHE INTERNAL "")
-+SET(HAVE_BMOVE CACHE INTERNAL "")
-+SET(HAVE_BSD_SIGNALS CACHE INTERNAL "")
-+SET(HAVE_BSEARCH CACHE INTERNAL "")
-+SET(HAVE_BSS_START CACHE INTENAL "")
-+SET(HAVE_BZERO CACHE INTERNAL "")
-+SET(HAVE_CHOWN CACHE INTERNAL "")
-+SET(HAVE_CLOCK_GETTIME CACHE INTERNAL "")
-+SET(HAVE_COMPRESS CACHE INTERNAL "")
-+SET(HAVE_CRYPT CACHE INTERNAL "")
-+SET(HAVE_CRYPT_H CACHE INTERNAL "")
-+SET(HAVE_CUSERID CACHE INTERNAL "")
-+SET(HAVE_CXXABI_H CACHE INTERNAL "")
-+SET(HAVE_CXX_NEW CACHE INTERNAL "")
-+SET(HAVE_DECL_FDATASYNC CACHE INTERNAL "")
-+SET(HAVE_SIGNAL_H 1 CACHE INTERNAL "")
-+SET(HAVE_GETHOSTBYNAME_R CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_ATTR_SETPRIO CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_ATTR_SETSCHEDPARAM CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_KILL CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_SETPRIO_NP CACHE INTERNAL "")
-+SET(HAVE_PTHREAD_SETSCHEDPARAM CACHE INTERNAL "")
-+SET(HAVE_SETFILEPOINTER CACHE INTERNAL "")
-+SET(SIZEOF_U_INT32_T CACHE INTERNAL "")
-+SET(IS_VOID_SIGNAL 1 CACHE INTERNAL "")
-+SET(IS_VOID_QSORT 1 CACHE INTERNAL "")
-+ENDIF()
-diff -x .bzr -u --recursive -N mariadb-native-client.release/CMakeLists.txt mariadb-native-client.trunk/CMakeLists.txt
---- mariadb/CMakeLists.txt 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/CMakeLists.txt 2013-10-19 07:29:16.000000000 +0200
-@@ -1,26 +1,68 @@
- # CMakeLists.txt
-
-
--# This is the libmysql-lgpl project.
-+# This is the LGPL libmariadb project.
- PROJECT(mariadb-client C)
-
- SET(CPACK_PACKAGE_VERSION_MAJOR 1)
--SET(CPACK_PACKAGE_VERSION_MINOR 0)
--SET(CPACK_PACKAGE_VERSION_PATCH 0)
-+SET(CPACK_PACKAGE_VERSION_MINOR 1)
-+SET(CPACK_PACKAGE_VERSION_PATCH 2)
-+SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-
--# Minimum required version is Cmake 2.6.x
--CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
-+# Minimum required version is Cmake 2.8.x
-+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
- IF(COMMAND CMAKE_POLICY)
- CMAKE_POLICY(SET CMP0003 NEW)
--ENDIF(COMMAND CMAKE_POLICY)
-+ENDIF()
-+
-+### Options ###
-+IF(NOT WIN32)
-+ OPTION(WITH_MYSQLCOMPAT "creates libmysql* symbolic links" ON)
-+ OPTION(WITH_OPENSSL "enables SSL support" ON)
-+ELSE()
-+ OPTION(WITH_OPENSSL "enables SSL support" OFF)
-+ENDIF()
-+
-+OPTION(WITH_SQLITE "Enables Sqlite support" OFF)
-+OPTION(WITH_EXTERNAL_ZLIB "Enables use of external zlib" OFF)
-+###############
-+
-
- IF(WIN32)
- # Speedup system tests
-- INCLUDE(${CMAKE_SOURCE_DIR}/WindowsCache.cmake)
--ENDIF()
-+ INCLUDE(${CMAKE_SOURCE_DIR}/cmake/WindowsCache.cmake)
-+ IF (MSVC)
-+ SET(CONFIG_TYPES "DEBUG" "RELEASE" "RELWITHDEBINFO")
-+ FOREACH(BUILD_TYPE ${CONFIG_TYPES})
-+ FOREACH(COMPILER CXX C)
-+ SET(COMPILER_FLAGS "${CMAKE_${COMPILER}_FLAGS_${BUILD_TYPE}}")
-+ IF (NOT COMPILER_FLAGS STREQUAL "")
-+ STRING(REPLACE "/MD" "/MT" COMPILER_FLAGS ${COMPILER_FLAGS})
-+ IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
-+ SET(COMPILER_FLAGS "${COMPILER_FLAGS} /RTC1 /RTCc")
-+ STRING(REPLACE "/Zi" "/ZI" COMPILER_FLAGS ${COMPILER_FLAGS})
-+ ENDIF()
-+ MESSAGE (STATUS "CMAKE_${COMPILER}_FLAGS_${BUILD_TYPE}= ${COMPILER_FLAGS}")
-+ SET(CMAKE_${COMPILER}_FLAGS_${BUILD_TYPE} ${COMPILER_FLAGS} CACHE
-+ STRING "overwritten by libmariadb" FORCE)
-+ ENDIF()
-+ ENDFOREACH()
-+ ENDFOREACH()
-+ ENDIF()
-+ENDIF()
-+
-+# Disable dbug information for release builds
-+SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DDBUG_OFF")
-+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF")
-+SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
-+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
-
- IF(UNIX)
-- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
-+ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFE_MUTEX")
-+ENDIF()
-+
-+IF(CMAKE_COMPILER_IS_GNUCC)
-+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wno-uninitialized")
- ENDIF()
-
- # If the build type isn't specified, set to Relwithdebinfo as default.
-@@ -28,33 +70,59 @@
- SET(CMAKE_BUILD_TYPE "Relwithdebinfo")
- ENDIF()
-
--
- # various defines for generating include/mysql_version.h
-+
- SET(PROTOCOL_VERSION 10) # we adapted new password option from PHP's mysqlnd !
- SET(MYSQL_CLIENT_VERSION_MAJOR "5")
--SET(MYSQL_CLIENT_VERSION_MINOR "3")
--SET(MYSQL_CLIENT_VERSION_PATCH "2")
-+SET(MYSQL_CLIENT_VERSION_MINOR "5")
-+SET(MYSQL_CLIENT_VERSION_PATCH "0")
- SET(MYSQL_CLIENT_VERSION "${MYSQL_CLIENT_VERSION_MAJOR}.${MYSQL_CLIENT_VERSION_MINOR}.${MYSQL_CLIENT_VERSION_PATCH}")
- MATH(EXPR MYSQL_VERSION_ID "${MYSQL_CLIENT_VERSION_MAJOR} * 10000 +
- ${MYSQL_CLIENT_VERSION_MINOR} * 100 +
- ${MYSQL_CLIENT_VERSION_PATCH}")
- IF (NOT MYSQL_PORT)
- SET(MYSQL_PORT 3306)
--ENDIF (NOT MYSQL_PORT)
-+ENDIF ()
- IF(NOT MYSQL_UNIX_ADDR)
- SET(MYSQL_UNIX_ADDR "/tmp/mysql.sock")
--ENDIF(NOT MYSQL_UNIX_ADDR)
-+ENDIF()
-
- # todo: we don't character sets in share - all is compiled in
- SET(SHAREDIR "share")
- SET(DEFAULT_CHARSET_HOME "${CMAKE_INSTALL_PREFIX}")
-+SET(PLUGINDIR "${CMAKE_INSTALL_PREFIX}/lib/plugin")
-+
-+INCLUDE(cmake/SearchLibrary.cmake)
-+
-+IF(WITH_EXTERNAL_ZLIB)
-+ FIND_PACKAGE(ZLIB QUIET)
-+ IF(${ZLIB_FOUND})
-+ SET(LIBZ "-lz")
-+ ENDIF()
-+ENDIF()
-+
-+IF(UNIX)
-+ SEARCH_LIBRARY(LIBNSL inet_ntoa "nsl_r;nsl")
-+ SEARCH_LIBRARY(LIBBIND bind "bind;socket")
-+ SEARCH_LIBRARY(LIBSOCKET setsockopt "socket")
-+ SEARCH_LIBRARY(LIBDL dlopen "dl")
-+ SEARCH_LIBRARY(LIBM floor m)
-+ SET(EXTRA_LIBS "${LIBNSL}" "${LIBBIND}" "${LIBSOCKET}" "${LIBDL}" "${LIBM}" "${LIBZ}")
-+ FIND_PACKAGE(Threads)
-+ SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${LIBNSL} ${LIBBIND}
-+ ${LIBSOCKET} ${LIBDL} ${LIBM} ${CMAKE_THREAD_LIBS_INIT})
-+ #remove possible dups from required libraries
-+ LIST(LENGTH CMAKE_REQUIRED_LIBRARIES rllength)
-+ IF(${rllength} GREATER 0)
-+ LIST(REMOVE_DUPLICATES CMAKE_REQUIRED_LIBRARIES)
-+ ENDIF()
-+ENDIF()
-
--FIND_PACKAGE(Threads)
-
- IF(CMAKE_HAVE_PTHREAD_H)
- SET(CMAKE_REQUIRED_INCLUDES pthread.h)
- ENDIF()
--#Check for threads
-+
- IF(WIN32)
- SET(HAVE_THREADS 1)
- ADD_DEFINITIONS(-DHAVE_DLOPEN)
-@@ -64,29 +132,28 @@
- SET(HAVE_THREADS ${CMAKE_USE_PTHREADS})
- ENDIF()
-
--IF(UNIX)
--FIND_LIBRARY(DL_LIBRARY dl)
--IF(DL_LIBRARY)
-- SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${CMAKE_DL_LIBS})
--ENDIF()
--ENDIF()
--
- # check for various include files
--INCLUDE(LibmysqlIncludeFiles.cmake)
-+INCLUDE(${CMAKE_SOURCE_DIR}/cmake/CheckIncludeFiles.cmake)
- # check for various functions
--INCLUDE(LibmysqlFunctions.cmake)
-+INCLUDE(${CMAKE_SOURCE_DIR}/cmake/CheckFunctions.cmake)
- # check for various types
--INCLUDE(LibmysqlTypes.cmake)
--
--
-+INCLUDE(${CMAKE_SOURCE_DIR}/cmake/CheckTypes.cmake)
-
- # Check for OpenSSL
--FIND_PACKAGE(OpenSSL)
--IF(OPENSSL_FOUND)
-- ADD_DEFINITIONS(-DHAVE_OPENSSL)
-+IF(WITH_OPENSSL)
-+ FIND_PACKAGE(OpenSSL)
-+ IF(OPENSSL_FOUND)
-+ ADD_DEFINITIONS(-DHAVE_OPENSSL)
-+ ENDIF()
-+ENDIF()
-+
-+IF(WITH_SQLITE)
-+ ADD_DEFINITIONS(-DHAVE_SQLITE)
- ENDIF()
-
--FIND_PACKAGE(ZLIB QUIET)
-+IF(NOT WIN32)
-+ INCLUDE(cmake/FindIconv.cmake)
-+ENDIF()
-
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/mysql_version.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/include/mysql_version.h)
-@@ -95,15 +162,16 @@
-
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/include)
-
--ADD_SUBDIRECTORY(libmysql)
--ADD_SUBDIRECTORY(examples)
-+ADD_SUBDIRECTORY(include)
-+ADD_SUBDIRECTORY(plugins)
-+ADD_SUBDIRECTORY(libmariadb)
- IF(NOT WIN32)
-- ADD_SUBDIRECTORY(mysql_config)
-+ ADD_SUBDIRECTORY(mariadb_config)
- ENDIF()
-
- IF(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/unittest)
- ADD_SUBDIRECTORY(unittest/mytap)
-- ADD_SUBDIRECTORY(unittest/libmysql)
-+ ADD_SUBDIRECTORY(unittest/libmariadb)
- ENDIF()
-
- IF(BUILD_DOCS)
-@@ -115,14 +183,16 @@
- SET(CMAKE_INSTALL_PREFIX "")
- ENDIF()
-
--
-+IF(WIN32)
-+ ADD_SUBDIRECTORY(win/packaging)
-+ENDIF()
-
- SET(CPACK_PACKAGE_VENDOR "Monty Program AB")
- SET(CPACK_PACKAGE_DESCRIPTION "MariaDB client library. A library for connecting to MariaDB and MySQL servers")
- SET(CPACK_PACKAGE_NAME "mariadb_client")
- SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.LIB")
- SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
--SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${MYSQL_CLIENT_VERSION}-src")
-+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-src")
-
- SET(CPACK_SOURCE_IGNORE_FILES
- .bzr/
-diff -x .bzr -u --recursive -N mariadb-native-client.release/docs/funcref/functions.ent mariadb-native-client.trunk/docs/funcref/functions.ent
---- mariadb/docs/funcref/functions.ent 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/docs/funcref/functions.ent 2013-10-19 07:29:16.000000000 +0200
-@@ -1,97 +1,97 @@
--<!ENTITY myodbc_remove_escape "funcref/myodbc_remove_escape.xml">
--<!ENTITY mysql_affected_rows "funcref/mysql_affected_rows.xml">
--<!ENTITY mysql_autocommit "funcref/mysql_autocommit.xml">
--<!ENTITY mysql_change_user "funcref/mysql_change_user.xml">
--<!ENTITY mysql_character_set_name "funcref/mysql_character_set_name.xml">
--<!ENTITY mysql_close "funcref/mysql_close.xml">
--<!ENTITY mysql_commit "funcref/mysql_commit.xml">
--<!ENTITY mysql_data_seek "funcref/mysql_data_seek.xml">
--<!ENTITY mysql_debug "funcref/mysql_debug.xml">
--<!ENTITY mysql_dump_debug_info "funcref/mysql_dump_debug_info.xml">
--<!ENTITY mysql_embedded "funcref/mysql_embedded.xml">
--<!ENTITY mysql_eof "funcref/mysql_eof.xml">
--<!ENTITY mysql_errno "funcref/mysql_errno.xml">
--<!ENTITY mysql_error "funcref/mysql_error.xml">
--<!ENTITY mysql_escape_string "funcref/mysql_escape_string.xml">
--<!ENTITY mysql_fetch_field "funcref/mysql_fetch_field.xml">
--<!ENTITY mysql_fetch_field_direct "funcref/mysql_fetch_field_direct.xml">
--<!ENTITY mysql_fetch_fields "funcref/mysql_fetch_fields.xml">
--<!ENTITY mysql_fetch_lengths "funcref/mysql_fetch_lengths.xml">
--<!ENTITY mysql_fetch_row "funcref/mysql_fetch_row.xml">
--<!ENTITY mysql_field_count "funcref/mysql_field_count.xml">
--<!ENTITY mysql_field_seek "funcref/mysql_field_seek.xml">
--<!ENTITY mysql_field_tell "funcref/mysql_field_tell.xml">
--<!ENTITY mysql_free_result "funcref/mysql_free_result.xml">
--<!ENTITY mysql_get_character_set_info "funcref/mysql_get_character_set_info.xml">
--<!ENTITY mysql_get_client_info "funcref/mysql_get_client_info.xml">
--<!ENTITY mysql_get_client_version "funcref/mysql_get_client_version.xml">
--<!ENTITY mysql_get_host_info "funcref/mysql_get_host_info.xml">
--<!ENTITY mysql_get_proto_info "funcref/mysql_get_proto_info.xml">
--<!ENTITY mysql_get_server_info "funcref/mysql_get_server_info.xml">
--<!ENTITY mysql_get_server_version "funcref/mysql_get_server_version.xml">
--<!ENTITY mysql_get_ssl_cipher "funcref/mysql_get_ssl_cipher.xml">
--<!ENTITY mysql_hex_string "funcref/mysql_hex_string.xml">
--<!ENTITY mysql_info "funcref/mysql_info.xml">
--<!ENTITY mysql_init "funcref/mysql_init.xml">
--<!ENTITY mysql_insert_id "funcref/mysql_insert_id.xml">
--<!ENTITY mysql_kill "funcref/mysql_kill.xml">
--<!ENTITY mysql_more_results "funcref/mysql_more_results.xml">
--<!ENTITY mysql_next_result "funcref/mysql_next_result.xml">
--<!ENTITY mysql_num_fields "funcref/mysql_num_fields.xml">
--<!ENTITY mysql_num_rows "funcref/mysql_num_rows.xml">
--<!ENTITY mysql_options "funcref/mysql_options.xml">
--<!ENTITY mysql_ping "funcref/mysql_ping.xml">
--<!ENTITY mysql_query "funcref/mysql_query.xml">
--<!ENTITY mysql_read_query_result "funcref/mysql_read_query_result.xml">
--<!ENTITY mysql_real_connect "funcref/mysql_real_connect.xml">
--<!ENTITY mysql_real_escape_string "funcref/mysql_real_escape_string.xml">
--<!ENTITY mysql_real_query "funcref/mysql_real_query.xml">
--<!ENTITY mysql_refresh "funcref/mysql_refresh.xml">
--<!ENTITY mysql_rollback "funcref/mysql_rollback.xml">
--<!ENTITY mysql_row_seek "funcref/mysql_row_seek.xml">
--<!ENTITY mysql_row_tell "funcref/mysql_row_tell.xml">
--<!ENTITY mysql_select_db "funcref/mysql_select_db.xml">
--<!ENTITY mysql_send_query "funcref/mysql_send_query.xml">
--<!ENTITY mysql_server_end "funcref/mysql_server_end.xml">
--<!ENTITY mysql_server_init "funcref/mysql_server_init.xml">
--<!ENTITY mysql_set_character_set "funcref/mysql_set_character_set.xml">
--<!ENTITY mysql_set_server_option "funcref/mysql_set_server_option.xml">
--<!ENTITY mysql_shutdown "funcref/mysql_shutdown.xml">
--<!ENTITY mysql_sqlstate "funcref/mysql_sqlstate.xml">
--<!ENTITY mysql_ssl_set "funcref/mysql_ssl_set.xml">
--<!ENTITY mysql_stat "funcref/mysql_stat.xml">
--<!ENTITY mysql_stmt_affected_rows "funcref/mysql_stmt_affected_rows.xml">
--<!ENTITY mysql_stmt_attr_get "funcref/mysql_stmt_attr_get.xml">
--<!ENTITY mysql_stmt_attr_set "funcref/mysql_stmt_attr_set.xml">
--<!ENTITY mysql_stmt_bind_param "funcref/mysql_stmt_bind_param.xml">
--<!ENTITY mysql_stmt_bind_result "funcref/mysql_stmt_bind_result.xml">
--<!ENTITY mysql_stmt_close "funcref/mysql_stmt_close.xml">
--<!ENTITY mysql_stmt_data_seek "funcref/mysql_stmt_data_seek.xml">
--<!ENTITY mysql_stmt_errno "funcref/mysql_stmt_errno.xml">
--<!ENTITY mysql_stmt_error "funcref/mysql_stmt_error.xml">
--<!ENTITY mysql_stmt_execute "funcref/mysql_stmt_execute.xml">
--<!ENTITY mysql_stmt_fetch "funcref/mysql_stmt_fetch.xml">
--<!ENTITY mysql_stmt_fetch_column "funcref/mysql_stmt_fetch_column.xml">
--<!ENTITY mysql_stmt_field_count "funcref/mysql_stmt_field_count.xml">
--<!ENTITY mysql_stmt_free_result "funcref/mysql_stmt_free_result.xml">
--<!ENTITY mysql_stmt_init "funcref/mysql_stmt_init.xml">
--<!ENTITY mysql_stmt_insert_id "funcref/mysql_stmt_insert_id.xml">
--<!ENTITY mysql_stmt_next_result "funcref/mysql_stmt_next_result.xml">
--<!ENTITY mysql_stmt_num_rows "funcref/mysql_stmt_num_rows.xml">
--<!ENTITY mysql_stmt_param_count "funcref/mysql_stmt_param_count.xml">
--<!ENTITY mysql_stmt_param_metadata "funcref/mysql_stmt_param_metadata.xml">
--<!ENTITY mysql_stmt_prepare "funcref/mysql_stmt_prepare.xml">
--<!ENTITY mysql_stmt_reset "funcref/mysql_stmt_reset.xml">
--<!ENTITY mysql_stmt_result_metadata "funcref/mysql_stmt_result_metadata.xml">
--<!ENTITY mysql_stmt_row_seek "funcref/mysql_stmt_row_seek.xml">
--<!ENTITY mysql_stmt_row_tell "funcref/mysql_stmt_row_tell.xml">
--<!ENTITY mysql_stmt_send_long_data "funcref/mysql_stmt_send_long_data.xml">
--<!ENTITY mysql_stmt_sqlstate "funcref/mysql_stmt_sqlstate.xml">
--<!ENTITY mysql_stmt_store_result "funcref/mysql_stmt_store_result.xml">
--<!ENTITY mysql_store_result "funcref/mysql_store_result.xml">
--<!ENTITY mysql_thread_end "funcref/mysql_thread_end.xml">
--<!ENTITY mysql_thread_id "funcref/mysql_thread_id.xml">
--<!ENTITY mysql_thread_init "funcref/mysql_thread_init.xml">
--<!ENTITY mysql_thread_safe "funcref/mysql_thread_safe.xml">
--<!ENTITY mysql_use_result "funcref/mysql_use_result.xml">
--<!ENTITY mysql_warning_count "funcref/mysql_warning_count.xml">
-\ No newline at end of file
-+<!ENTITY functions.mysql_affected_rows "funcref/mysql_affected_rows.xml">
-+<!ENTITY functions.mysql_autocommit "funcref/mysql_autocommit.xml">
-+<!ENTITY functions.mysql_change_user "funcref/mysql_change_user.xml">
-+<!ENTITY functions.mysql_character_set_name "funcref/mysql_character_set_name.xml">
-+<!ENTITY functions.mysql_close "funcref/mysql_close.xml">
-+<!ENTITY functions.mysql_commit "funcref/mysql_commit.xml">
-+<!ENTITY functions.mysql_data_seek "funcref/mysql_data_seek.xml">
-+<!ENTITY functions.mysql_debug "funcref/mysql_debug.xml">
-+<!ENTITY functions.mysql_dump_debug_info "funcref/mysql_dump_debug_info.xml">
-+<!ENTITY functions.mysql_embedded "funcref/mysql_embedded.xml">
-+<!ENTITY functions.mysql_eof "funcref/mysql_eof.xml">
-+<!ENTITY functions.mysql_errno "funcref/mysql_errno.xml">
-+<!ENTITY functions.mysql_error "funcref/mysql_error.xml">
-+<!ENTITY functions.mysql_escape_string "funcref/mysql_escape_string.xml">
-+<!ENTITY functions.mysql_fetch_field "funcref/mysql_fetch_field.xml">
-+<!ENTITY functions.mysql_fetch_field_direct "funcref/mysql_fetch_field_direct.xml">
-+<!ENTITY functions.mysql_fetch_fields "funcref/mysql_fetch_fields.xml">
-+<!ENTITY functions.mysql_fetch_lengths "funcref/mysql_fetch_lengths.xml">
-+<!ENTITY functions.mysql_fetch_row "funcref/mysql_fetch_row.xml">
-+<!ENTITY functions.mysql_field_count "funcref/mysql_field_count.xml">
-+<!ENTITY functions.mysql_field_seek "funcref/mysql_field_seek.xml">
-+<!ENTITY functions.mysql_field_tell "funcref/mysql_field_tell.xml">
-+<!ENTITY functions.mysql_free_result "funcref/mysql_free_result.xml">
-+<!ENTITY functions.mysql_get_character_set_info "funcref/mysql_get_character_set_info.xml">
-+<!ENTITY functions.mysql_get_client_info "funcref/mysql_get_client_info.xml">
-+<!ENTITY functions.mysql_get_client_version "funcref/mysql_get_client_version.xml">
-+<!ENTITY functions.mysql_get_host_info "funcref/mysql_get_host_info.xml">
-+<!ENTITY functions.mysql_get_proto_info "funcref/mysql_get_proto_info.xml">
-+<!ENTITY functions.mysql_get_server_info "funcref/mysql_get_server_info.xml">
-+<!ENTITY functions.mysql_get_server_name "funcref/mysql_get_server_name.xml">
-+<!ENTITY functions.mysql_get_server_version "funcref/mysql_get_server_version.xml">
-+<!ENTITY functions.mysql_get_ssl_cipher "funcref/mysql_get_ssl_cipher.xml">
-+<!ENTITY functions.mysql_hex_string "funcref/mysql_hex_string.xml">
-+<!ENTITY functions.mysql_info "funcref/mysql_info.xml">
-+<!ENTITY functions.mysql_init "funcref/mysql_init.xml">
-+<!ENTITY functions.mysql_insert_id "funcref/mysql_insert_id.xml">
-+<!ENTITY functions.mysql_kill "funcref/mysql_kill.xml">
-+<!ENTITY functions.mysql_more_results "funcref/mysql_more_results.xml">
-+<!ENTITY functions.mysql_next_result "funcref/mysql_next_result.xml">
-+<!ENTITY functions.mysql_num_fields "funcref/mysql_num_fields.xml">
-+<!ENTITY functions.mysql_num_rows "funcref/mysql_num_rows.xml">
-+<!ENTITY functions.mysql_options "funcref/mysql_options.xml">
-+<!ENTITY functions.mysql_ping "funcref/mysql_ping.xml">
-+<!ENTITY functions.mysql_query "funcref/mysql_query.xml">
-+<!ENTITY functions.mysql_read_query_result "funcref/mysql_read_query_result.xml">
-+<!ENTITY functions.mysql_real_connect "funcref/mysql_real_connect.xml">
-+<!ENTITY functions.mysql_real_escape_string "funcref/mysql_real_escape_string.xml">
-+<!ENTITY functions.mysql_real_query "funcref/mysql_real_query.xml">
-+<!ENTITY functions.mysql_refresh "funcref/mysql_refresh.xml">
-+<!ENTITY functions.mysql_rollback "funcref/mysql_rollback.xml">
-+<!ENTITY functions.mysql_row_seek "funcref/mysql_row_seek.xml">
-+<!ENTITY functions.mysql_row_tell "funcref/mysql_row_tell.xml">
-+<!ENTITY functions.mysql_select_db "funcref/mysql_select_db.xml">
-+<!ENTITY functions.mysql_send_query "funcref/mysql_send_query.xml">
-+<!ENTITY functions.mysql_server_end "funcref/mysql_server_end.xml">
-+<!ENTITY functions.mysql_server_init "funcref/mysql_server_init.xml">
-+<!ENTITY functions.mysql_set_character_set "funcref/mysql_set_character_set.xml">
-+<!ENTITY functions.mysql_set_server_option "funcref/mysql_set_server_option.xml">
-+<!ENTITY functions.mysql_shutdown "funcref/mysql_shutdown.xml">
-+<!ENTITY functions.mysql_sqlstate "funcref/mysql_sqlstate.xml">
-+<!ENTITY functions.mysql_ssl_set "funcref/mysql_ssl_set.xml">
-+<!ENTITY functions.mysql_stat "funcref/mysql_stat.xml">
-+<!ENTITY functions.mysql_stmt_affected_rows "funcref/mysql_stmt_affected_rows.xml">
-+<!ENTITY functions.mysql_stmt_attr_get "funcref/mysql_stmt_attr_get.xml">
-+<!ENTITY functions.mysql_stmt_attr_set "funcref/mysql_stmt_attr_set.xml">
-+<!ENTITY functions.mysql_stmt_bind_param "funcref/mysql_stmt_bind_param.xml">
-+<!ENTITY functions.mysql_stmt_bind_result "funcref/mysql_stmt_bind_result.xml">
-+<!ENTITY functions.mysql_stmt_close "funcref/mysql_stmt_close.xml">
-+<!ENTITY functions.mysql_stmt_data_seek "funcref/mysql_stmt_data_seek.xml">
-+<!ENTITY functions.mysql_stmt_errno "funcref/mysql_stmt_errno.xml">
-+<!ENTITY functions.mysql_stmt_error "funcref/mysql_stmt_error.xml">
-+<!ENTITY functions.mysql_stmt_execute "funcref/mysql_stmt_execute.xml">
-+<!ENTITY functions.mysql_stmt_fetch "funcref/mysql_stmt_fetch.xml">
-+<!ENTITY functions.mysql_stmt_fetch_column "funcref/mysql_stmt_fetch_column.xml">
-+<!ENTITY functions.mysql_stmt_field_count "funcref/mysql_stmt_field_count.xml">
-+<!ENTITY functions.mysql_stmt_free_result "funcref/mysql_stmt_free_result.xml">
-+<!ENTITY functions.mysql_stmt_init "funcref/mysql_stmt_init.xml">
-+<!ENTITY functions.mysql_stmt_insert_id "funcref/mysql_stmt_insert_id.xml">
-+<!ENTITY functions.mysql_stmt_next_result "funcref/mysql_stmt_next_result.xml">
-+<!ENTITY functions.mysql_stmt_num_rows "funcref/mysql_stmt_num_rows.xml">
-+<!ENTITY functions.mysql_stmt_param_count "funcref/mysql_stmt_param_count.xml">
-+<!ENTITY functions.mysql_stmt_param_metadata "funcref/mysql_stmt_param_metadata.xml">
-+<!ENTITY functions.mysql_stmt_prepare "funcref/mysql_stmt_prepare.xml">
-+<!ENTITY functions.mysql_stmt_reset "funcref/mysql_stmt_reset.xml">
-+<!ENTITY functions.mysql_stmt_result_metadata "funcref/mysql_stmt_result_metadata.xml">
-+<!ENTITY functions.mysql_stmt_row_seek "funcref/mysql_stmt_row_seek.xml">
-+<!ENTITY functions.mysql_stmt_row_tell "funcref/mysql_stmt_row_tell.xml">
-+<!ENTITY functions.mysql_stmt_send_long_data "funcref/mysql_stmt_send_long_data.xml">
-+<!ENTITY functions.mysql_stmt_sqlstate "funcref/mysql_stmt_sqlstate.xml">
-+<!ENTITY functions.mysql_stmt_store_result "funcref/mysql_stmt_store_result.xml">
-+<!ENTITY functions.mysql_store_result "funcref/mysql_store_result.xml">
-+<!ENTITY functions.mysql_thread_end "funcref/mysql_thread_end.xml">
-+<!ENTITY functions.mysql_thread_id "funcref/mysql_thread_id.xml">
-+<!ENTITY functions.mysql_thread_init "funcref/mysql_thread_init.xml">
-+<!ENTITY functions.mysql_thread_safe "funcref/mysql_thread_safe.xml">
-+<!ENTITY functions.mysql_use_result "funcref/mysql_use_result.xml">
-+<!ENTITY functions.mysql_warning_count "funcref/mysql_warning_count.xml">
-diff -x .bzr -u --recursive -N mariadb-native-client.release/docs/funcref/myodbc_remove_escape.xml mariadb-native-client.trunk/docs/funcref/myodbc_remove_escape.xml
---- mariadb/docs/funcref/myodbc_remove_escape.xml 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/docs/funcref/myodbc_remove_escape.xml 1970-01-01 01:00:00.000000000 +0100
-@@ -1,40 +0,0 @@
--<?xml version='1.0' encoding='UTF-8'?>
-- <refentry id="functions.myodbc_remove_escape" display-name="0">
-- <refmeta>
-- <refentrytitle>myodbc_remove_escape</refentrytitle>
-- </refmeta>
-- <refnamediv>
-- <refname>myodbc_remove_escape</refname>
-- <refpurpose>@function_short_description@</refpurpose>
-- </refnamediv>
-- <refsect1 role="description">
-- <methodsynopsis>
-- <type>void</type>
-- <methodname>myodbc_remove_escape</methodname>
-- <methodparam><type>MYSQL *</type><parameter>mysql</parameter></methodparam>
-- <methodparam><type>char *</type><parameter>name</parameter></methodparam>
--
-- </methodsynopsis>
-- <para>@long_description@</para>
-- </refsect1>
-- <refsect1 role="parameters">
-- <title>Parameters</title>
-- <variablelist>
-- <varlistentry><term><parameter>mysql</parameter></term><listitem><para>! todo !</para></listitem></varlistentry>
-- <varlistentry><term><parameter>name</parameter></term><listitem><para>! todo !</para></listitem></varlistentry>
--
-- </variablelist>
-- </refsect1>
-- <refsect1 role="returnvalue">
-- <title>Return value</title>
-- <para>@return_value@</para>
-- </refsect1>
-- <refsect1 role="returnvalue">
-- <note>
-- <title></title>
-- </note>
-- </refsect1>
-- <refsect1 role="seealso">
-- <title>See also</title>
-- </refsect1>
-- </refentry>
-diff -x .bzr -u --recursive -N mariadb-native-client.release/docs/funcref/mysql_commit.xml mariadb-native-client.trunk/docs/funcref/mysql_commit.xml
---- mariadb/docs/funcref/mysql_commit.xml 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/docs/funcref/mysql_commit.xml 2013-10-19 07:29:16.000000000 +0200
-@@ -39,6 +39,6 @@
- </refsect1>
- <refsect1 role="seealso">
- <title>See also</title>
-- <para><function>mysql_rollback()</function></para>
-+ <para><function>mysql_rollback</function></para>
- </refsect1>
- </refentry>
-diff -x .bzr -u --recursive -N mariadb-native-client.release/docs/funcref/mysql_get_server_name.xml mariadb-native-client.trunk/docs/funcref/mysql_get_server_name.xml
---- mariadb/docs/funcref/mysql_get_server_name.xml 1970-01-01 01:00:00.000000000 +0100
-+++ mariadb/docs/funcref/mysql_get_server_name.xml 2013-10-19 07:29:16.000000000 +0200
-@@ -0,0 +1,44 @@
-+<?xml version='1.0' encoding='UTF-8'?>
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-+ "docbook/dtd/xml/4.2/docbookx.dtd" [
-+<!ENTITY % global_ents SYSTEM "../global.ent">
-+%global_ents;
-+]>
-+ <refentry id="functions.mysql_get_server_name" display-name="0">
-+ <refmeta>
-+ <refentrytitle>mysql_get_server_name</refentrytitle>
-+ </refmeta>
-+ <refnamediv>
-+ <refname>mysql_get_server_name</refname>
-+ <refpurpose>Returns the name of the connected database server</refpurpose>
-+ </refnamediv>
-+ <refsect1 role="description">
-+ <methodsynopsis>
-+ <type>const char *</type>
-+ <methodname>mysql_get_server_name</methodname>
-+ <methodparam><type>MYSQL *</type><parameter>mysql</parameter></methodparam>
-+ </methodsynopsis>
-+ <para>Returns the name of the connected database server.</para>
-+ </refsect1>
-+ <refsect1 role="parameters">
-+ <title>Parameters</title>
-+ <variablelist>
-+ <varlistentry><term><parameter>mysql</parameter></term><listitem><para>¶m.mysql;</para></listitem></varlistentry>
-+ </variablelist>
-+ </refsect1>
-+ <refsect1 role="returnvalue">
-+ <title>Return value</title>
-+ <para>Returns the name of the connected database server.</para>
-+ </refsect1>
-+ <refsect1 role="notes">
-+ <note>
-+ <title></title>
-+ <para>In case the connection is using a plugin to connect to a database
-+ the name of the plugin will be returned.</para>
-+ </note>
-+ </refsect1>
-+ <refsect1 role="seealso">
-+ <title>See also</title>
-+ <para><function>mysql_options()</function>, <function>mysql_real_connect()</function></para>
-+ </refsect1>
-+ </refentry>
-diff -x .bzr -u --recursive -N mariadb-native-client.release/docs/funcref/mysql_options.xml mariadb-native-client.trunk/docs/funcref/mysql_options.xml
---- mariadb/docs/funcref/mysql_options.xml 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/docs/funcref/mysql_options.xml 2013-10-19 07:29:16.000000000 +0200
-@@ -202,6 +202,19 @@
- </informalexample>
- </listitem>
- </varlistentry>
-+ <varlistentry>
-+ <term><parameter>MYSQL_OPT_DATABASE_DRIVER</parameter></term>
-+ <listitem>
-+ <para>Specifies to load an alternative database driver for communication with other databases than MariaDB, e.g. sqlite.
-+ Database drivers are implemented by plugins. Mariadb client library provides built-in support for Sqlite.</para>
-+ <informalexample>
-+ <programlisting>
-+mysql_options(mysql, MYSQL_DATABASE_DRIVER, "sqlite");
-+ </programlisting>
-+ </informalexample>
-+ </listitem>
-+ </varlistentry>
-+
- </variablelist>
- </listitem></varlistentry>
- <varlistentry><term><parameter>arg</parameter></term><listitem><para>The value for the option</para></listitem></varlistentry>
-diff -x .bzr -u --recursive -N mariadb-native-client.release/docs/funcref/mysql_real_escape_string.xml mariadb-native-client.trunk/docs/funcref/mysql_real_escape_string.xml
---- mariadb/docs/funcref/mysql_real_escape_string.xml 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/docs/funcref/mysql_real_escape_string.xml 2013-10-19 07:29:16.000000000 +0200
-@@ -19,7 +19,7 @@
- <methodparam><type>MYSQL *</type><parameter>mysql</parameter></methodparam>
- <methodparam><type>char *</type><parameter>to</parameter></methodparam>
- <methodparam><type>const char *</type><parameter>from</parameter></methodparam>
-- <methodparam><type>unsigned</type><parameter>long</parameter></methodparam>
-+ <methodparam><type>unsigned long</type><parameter>length</parameter></methodparam>
-
- </methodsynopsis>
- <para>This function is used to create a legal SQL string that you can use in an SQL statement. The given string is encoded to an escaped SQL string, taking into account the current character set of the connection.</para>
-@@ -28,9 +28,9 @@
- <title>Parameters</title>
- <variablelist>
- <varlistentry><term><parameter>mysql</parameter></term><listitem><para>¶m.mysql;</para></listitem></varlistentry>
-- <varlistentry><term><parameter>to</parameter></term><listitem><para>buffer for the encoded string. The size of this buffer must be length * 2 + 1 bytes: in worst case every character of the from stirng needs to be escaped. Additionally a trailing 0 character will be appended.</para></listitem></varlistentry>
-+ <varlistentry><term><parameter>to</parameter></term><listitem><para>buffer for the encoded string. The size of this buffer must be length * 2 + 1 bytes: in worst case every character of the from string needs to be escaped. Additionally a trailing 0 character will be appended.</para></listitem></varlistentry>
- <varlistentry><term><parameter>from</parameter></term><listitem><para>An string which will be encoded by <function>mysql_real_escape_string()</function>.</para></listitem></varlistentry>
-- <varlistentry><term><parameter>long</parameter></term><listitem><para>The length of <parameter>from</parameter> string.</para></listitem></varlistentry>
-+ <varlistentry><term><parameter>length</parameter></term><listitem><para>The length of <parameter>from</parameter> string.</para></listitem></varlistentry>
-
- </variablelist>
- </refsect1>
-@@ -38,12 +38,6 @@
- <title>Return value</title>
- <para>Returns the length of the encoded (<parameter>to</parameter>) string.</para>
- </refsect1>
-- <refsect1 role="returnvalue">
-- <note>
-- <title></title>
-- <para>todo!</para>
-- </note>
-- </refsect1>
- <refsect1 role="seealso">
- <title>See also</title>
- </refsect1>
-diff -x .bzr -u --recursive -N mariadb-native-client.release/docs/mariadb-client.xml mariadb-native-client.trunk/docs/mariadb-client.xml
---- mariadb/docs/mariadb-client.xml 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/docs/mariadb-client.xml 2013-10-19 07:29:16.000000000 +0200
-@@ -3,7 +3,6 @@
- "docbook/dtd/xml/4.2/docbookx.dtd" [
- <!ENTITY % global_ents SYSTEM "global.ent">
- %global_ents;
--<!ENTITY myodbc_remove_escape "funcref/myodbc_remove_escape.xml">
- <!ENTITY mysql_affected_rows "funcref/mysql_affected_rows.xml">
- <!ENTITY mysql_autocommit "funcref/mysql_autocommit.xml">
- <!ENTITY mysql_change_user "funcref/mysql_change_user.xml">
-@@ -28,11 +27,13 @@
- <!ENTITY mysql_field_tell "funcref/mysql_field_tell.xml">
- <!ENTITY mysql_free_result "funcref/mysql_free_result.xml">
- <!ENTITY mysql_get_character_set_info "funcref/mysql_get_character_set_info.xml">
-+<!ENTITY mysql_get_character_set_info "funcref/mysql_get_server_name.xml">
- <!ENTITY mysql_get_client_info "funcref/mysql_get_client_info.xml">
- <!ENTITY mysql_get_client_version "funcref/mysql_get_client_version.xml">
- <!ENTITY mysql_get_host_info "funcref/mysql_get_host_info.xml">
- <!ENTITY mysql_get_proto_info "funcref/mysql_get_proto_info.xml">
- <!ENTITY mysql_get_server_info "funcref/mysql_get_server_info.xml">
-+<!ENTITY mysql_get_server_name "funcref/mysql_get_server_name.xml">
- <!ENTITY mysql_get_server_version "funcref/mysql_get_server_version.xml">
- <!ENTITY mysql_get_ssl_cipher "funcref/mysql_get_ssl_cipher.xml">
- <!ENTITY mysql_hex_string "funcref/mysql_hex_string.xml">
-@@ -108,7 +109,6 @@
- </section>
- <section>
- <title>Functions</title>
-- <xi:include href="&myodbc_remove_escape;" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="&mysql_affected_rows;" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="&mysql_autocommit;" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="&mysql_change_user;" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-@@ -138,6 +138,7 @@
- <xi:include href="&mysql_get_host_info;" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="&mysql_get_proto_info;" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="&mysql_get_server_info;" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-+ <xi:include href="&mysql_get_server_name;" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="&mysql_get_server_version;" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="&mysql_get_ssl_cipher;" xmlns:xi="http://www.w3.org/2001/XInclude"/>
- <xi:include href="&mysql_hex_string;" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/CMakeLists.txt mariadb-native-client.trunk/include/CMakeLists.txt
---- mariadb/include/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100
-+++ mariadb/include/CMakeLists.txt 2013-10-19 07:29:16.000000000 +0200
-@@ -0,0 +1,35 @@
-+SET(MARIADB_CLIENT_INCLUDES config-win.h
-+ dbug.h
-+ errmsg.h
-+ getopt.h
-+ global.h
-+ hash.h
-+ ma_common.h
-+ m_ctype.h
-+ m_string.h
-+ ma_dyncol.h
-+ ma_secure.h
-+ my_alarm.h
-+ my_base.h
-+ my_config.h
-+ my_dir.h
-+ my_global.h
-+ my_list.h
-+ my_net.h
-+ my_no_pthread.h
-+ my_pthread.h
-+ my_stmt.h
-+ my_sys.h
-+ mysql.h
-+ mysql_com.h
-+ mysql_io.h
-+ mysql_mm.h
-+ mysql_priv.h
-+ mysql_version.h
-+ mysql_wireprotocol.h
-+ mysqld_error.h
-+ mysys_err.h
-+ sha1.h
-+ thr_alarm.h
-+ violite.h
-+ PARENT_SCOPE)
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/config-win.h mariadb-native-client.trunk/include/config-win.h
---- mariadb/include/config-win.h 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/include/config-win.h 2013-10-19 07:29:16.000000000 +0200
-@@ -111,7 +111,7 @@
- #define bool_defined
- #define byte_defined
- #define HUGE_PTR
--#define STDCALL __stdcall /* Used by libmysql.dll */
-+#define STDCALL __stdcall /* Used by libmariadb.dll */
-
- #define VOID_SIGHANDLER
- #define SIZEOF_CHAR 1
-@@ -213,9 +213,9 @@
- #define HAVE_STRPBRK
- #define HAVE_STRSTR
-
--#ifdef NOT_USED
-+#ifdef WIN32
- #define HAVE_SNPRINTF /* Gave link error */
--#define _snprintf snprintf
-+#define snprintf _snprintf
- #endif
-
- #ifdef _MSC_VER
-@@ -264,4 +264,9 @@
- #define statistic_increment(V,L) thread_safe_increment((V),(L))
- #define strcasecmp(A,B) _stricmp((A),(B))
-
-+#define close(A) _close((A))
-+#define fdopen(A,B) _fdopen((A),(B))
-+#define sopen(A,B,C,D) _sopen((A),(B),(C),(D))
-+
-+
- #endif
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/dbug.h mariadb-native-client.trunk/include/dbug.h
---- mariadb/include/dbug.h 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/include/dbug.h 2013-10-19 07:29:16.000000000 +0200
-@@ -21,34 +21,48 @@
- extern "C" {
- #endif
- #if !defined(DBUG_OFF) && !defined(_lint)
--extern int _db_on_,_no_db_;
--extern FILE *_db_fp_;
--extern char *_db_process_;
--extern int _db_keyword_(const char *keyword);
--extern void _db_setjmp_(void);
--extern void _db_longjmp_(void);
--extern void _db_push_(const char *control);
--extern void _db_pop_(void);
--extern void _db_enter_(const char *_func_,const char *_file_,uint _line_,
-- const char **_sfunc_,const char **_sfile_,
-- uint *_slevel_, char ***);
--extern void _db_return_(uint _line_,const char **_sfunc_,const char **_sfile_,
-- uint *_slevel_);
--extern void _db_pargs_(uint _line_,const char *keyword);
--extern void _db_doprnt_ _VARARGS((const char *format,...));
--extern void _db_dump_(uint _line_,const char *keyword,const char *memory,
-- uint length);
--extern void _db_lock_file();
--extern void _db_unlock_file();
-
--#define DBUG_ENTER(a) const char *_db_func_, *_db_file_; uint _db_level_; \
-- char **_db_framep_; \
-- _db_enter_ (a,__FILE__,__LINE__,&_db_func_,&_db_file_,&_db_level_, \
-- &_db_framep_)
-+struct _db_stack_frame_ {
-+ const char *func; /* function name of the previous stack frame */
-+ const char *file; /* filename of the function of previous frame */
-+ uint level; /* this nesting level, highest bit enables tracing */
-+ struct _db_stack_frame_ *prev; /* pointer to the previous frame */
-+};
-+
-+struct _db_code_state_;
-+extern my_bool _dbug_on_;
-+extern my_bool _db_keyword_(struct _db_code_state_ *, const char *, int);
-+extern int _db_explain_(struct _db_code_state_ *cs, char *buf, size_t len);
-+extern int _db_explain_init_(char *buf, size_t len);
-+extern int _db_is_pushed_(void);
-+extern void _db_setjmp_(void);
-+extern void _db_longjmp_(void);
-+extern void _db_process_(const char *name);
-+extern void _db_push_(const char *control);
-+extern void _db_pop_(void);
-+extern void _db_set_(const char *control);
-+extern void _db_set_init_(const char *control);
-+extern void _db_enter_(const char *_func_, const char *_file_, uint _line_,
-+ struct _db_stack_frame_ *_stack_frame_);
-+extern void _db_return_(uint _line_, struct _db_stack_frame_ *_stack_frame_);
-+extern void _db_pargs_(uint _line_,const char *keyword);
-+extern void _db_doprnt_ _VARARGS((const char *format,...));
-+extern void _db_dump_(uint _line_,const char *keyword,
-+ const unsigned char *memory, size_t length);
-+extern void _db_end_(void);
-+extern void _db_lock_file_(void);
-+extern void _db_unlock_file_(void);
-+extern FILE *_db_fp_(void);
-+extern void _db_flush_();
-+extern const char* _db_get_func_(void);
-+/*
-+#define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_; \
-+ _db_enter_ (a,__FILE__,__LINE__,&_db_stack_frame_)
- #define DBUG_LEAVE \
- (_db_return_ (__LINE__, &_db_func_, &_db_file_, &_db_level_))
--#define DBUG_RETURN(a1) {DBUG_LEAVE; return(a1);}
-+#define DBUG_RETURN(a1) do {DBUG_LEAVE; return(a1);} while(0)
- #define DBUG_VOID_RETURN {DBUG_LEAVE; return;}
-+#define DBUG_END() _db_end_ ()
- #define DBUG_EXECUTE(keyword,a1) \
- {if (_db_on_) {if (_db_keyword_ (keyword)) { a1 }}}
- #define DBUG_PRINT(keyword,arglist) \
-@@ -66,10 +80,49 @@
- #define DEBUGGER_ON _no_db_=0
- #define DBUG_LOCK_FILE { _db_lock_file(); }
- #define DBUG_UNLOCK_FILE { _db_unlock_file(); }
-+#define DBUG_ASSERT(A) assert(A) */
-+#define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_; \
-+ _db_enter_ (a,__FILE__,__LINE__,&_db_stack_frame_)
-+#define DBUG_LEAVE _db_return_ (__LINE__, &_db_stack_frame_)
-+#define DBUG_RETURN(a1) do {DBUG_LEAVE; return(a1);} while(0)
-+#define DBUG_VOID_RETURN do {DBUG_LEAVE; return;} while(0)
-+#define DBUG_EXECUTE(keyword,a1) \
-+ do {if (_db_keyword_(0, (keyword), 0)) { a1 }} while(0)
-+#define DBUG_EXECUTE_IF(keyword,a1) \
-+ do {if (_db_keyword_(0, (keyword), 1)) { a1 }} while(0)
-+#define DBUG_EVALUATE(keyword,a1,a2) \
-+ (_db_keyword_(0,(keyword), 0) ? (a1) : (a2))
-+#define DBUG_EVALUATE_IF(keyword,a1,a2) \
-+ (_db_keyword_(0,(keyword), 1) ? (a1) : (a2))
-+#define DBUG_PRINT(keyword,arglist) \
-+ do {_db_pargs_(__LINE__,keyword); _db_doprnt_ arglist;} while(0)
-+#define DBUG_PUSH(a1) _db_push_ (a1)
-+#define DBUG_POP() _db_pop_ ()
-+#define DBUG_SET(a1) _db_set_ (a1)
-+#define DBUG_SET_INITIAL(a1) _db_set_init_ (a1)
-+#define DBUG_PROCESS(a1) _db_process_(a1)
-+#define DBUG_FILE _db_fp_()
-+#define DBUG_SETJMP(a1) (_db_setjmp_ (), setjmp (a1))
-+#define DBUG_LONGJMP(a1,a2) (_db_longjmp_ (), longjmp (a1, a2))
-+#define DBUG_DUMP(keyword,a1,a2) _db_dump_(__LINE__,keyword,a1,a2)
-+#define DBUG_END() _db_end_ ()
-+#define DBUG_LOCK_FILE _db_lock_file_()
-+#define DBUG_UNLOCK_FILE _db_unlock_file_()
- #define DBUG_ASSERT(A) assert(A)
-+#define DBUG_EXPLAIN(buf,len) _db_explain_(0, (buf),(len))
-+#define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len))
-+#define DEBUGGER_OFF do { _dbug_on_= 0; } while(0)
-+#define DEBUGGER_ON do { _dbug_on_= 1; } while(0)
-+#ifndef _WIN32
-+#define DBUG_ABORT() (_db_flush_(), abort())
-+#else
-+#define DBUG_ABORT() (_db_flush_(), exit(3))
-+#endif
-+
- #else /* No debugger */
-
- #define DBUG_ENTER(a1)
-+#define DBUG_END() {}
- #define DBUG_RETURN(a1) return(a1)
- #define DBUG_VOID_RETURN return
- #define DBUG_EXECUTE(keyword,a1) {}
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/errmsg.h mariadb-native-client.trunk/include/errmsg.h
---- mariadb/include/errmsg.h 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/include/errmsg.h 2013-10-19 07:29:16.000000000 +0200
-@@ -17,6 +17,8 @@
-
- /* Error messages for mysql clients */
- /* error messages for the demon is in share/language/errmsg.sys */
-+#ifndef _errmsg_h_
-+#define _errmsg_h_
-
- #ifdef __cplusplus
- extern "C" {
-@@ -71,5 +73,8 @@
- #define CR_NEW_STMT_METADATA 2057
- #define CR_AUTH_PLUGIN_CANNOT_LOAD 2058
- #define CR_ALREADY_CONNECTED 2059
-+#define CR_PLUGIN_FUNCTION_NOT_SUPPORTED 2060
-
- #define SQLSTATE_UNKNOWN "HY000"
-+
-+#endif
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/global.h mariadb-native-client.trunk/include/global.h
---- mariadb/include/global.h 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/include/global.h 2013-10-19 07:29:16.000000000 +0200
-@@ -402,11 +402,7 @@
- #define IO_SIZE 4096
- /* How much overhead does malloc have. The code often allocates
- something like 1024-MALLOC_OVERHEAD bytes */
--#ifdef SAFEMALLOC
--#define MALLOC_OVERHEAD (8+24+4)
--#else
- #define MALLOC_OVERHEAD 8
--#endif
- /* get memory in huncs */
- #define ONCE_ALLOC_INIT (uint) (4096-MALLOC_OVERHEAD)
- /* Typical record cash */
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/hash.h mariadb-native-client.trunk/include/hash.h
---- mariadb/include/hash.h 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/include/hash.h 2013-10-19 07:29:16.000000000 +0200
-@@ -1,4 +1,6 @@
--/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-+/************************************************************************************
-+ Copyright (C) 2000, 2012 MySQL AB & MySQL Finland AB & TCX DataKonsult AB,
-+ Monty Program AB
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
-@@ -11,11 +13,13 @@
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
-- License along with this library; if not, write to the Free
-- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-- MA 02111-1307, USA */
--
--/* Dynamic hashing of record with different key-length */
-+ License along with this library; if not see <http://www.gnu.org/licenses>
-+ or write to the Free Software Foundation, Inc.,
-+ 51 Franklin St., Fifth Floor, Boston, MA 02110, USA
-+
-+ Part of this code includes code from the PHP project which
-+ is freely available from http://www.php.net
-+*************************************************************************************/
-
- #ifndef _hash_h
- #define _hash_h
-@@ -23,7 +27,7 @@
- extern "C" {
- #endif
-
--typedef byte *(*hash_get_key)(const byte *,uint*,my_bool);
-+typedef uchar *(*hash_get_key)(const uchar *,uint*,my_bool);
- typedef void (*hash_free_key)(void *);
-
- /* flags for hash_init */
-@@ -31,7 +35,7 @@
-
- typedef struct st_hash_info {
- uint next; /* index to next key */
-- byte *data; /* data for current entry */
-+ uchar *data; /* data for current entry */
- } HASH_LINK;
-
- typedef struct st_hash {
-@@ -41,7 +45,7 @@
- DYNAMIC_ARRAY array; /* Place for hash_keys */
- hash_get_key get_key;
- void (*free)(void *);
-- uint (*calc_hashnr)(const byte *key,uint length);
-+ uint (*calc_hashnr)(const uchar *key,uint length);
- } HASH;
-
- #define hash_init(A,B,C,D,E,F,G) _hash_init(A,B,C,D,E,F,G CALLER_INFO)
-@@ -49,12 +53,12 @@
- uint key_length, hash_get_key get_key,
- void (*free_element)(void*), uint flags CALLER_INFO_PROTO);
- void hash_free(HASH *tree);
--byte *hash_element(HASH *hash,uint idx);
--gptr hash_search(HASH *info,const byte *key,uint length);
--gptr hash_next(HASH *info,const byte *key,uint length);
--my_bool hash_insert(HASH *info,const byte *data);
--my_bool hash_delete(HASH *hash,byte *record);
--my_bool hash_update(HASH *hash,byte *record,byte *old_key,uint old_key_length);
-+uchar *hash_element(HASH *hash,uint idx);
-+gptr hash_search(HASH *info,const uchar *key,uint length);
-+gptr hash_next(HASH *info,const uchar *key,uint length);
-+my_bool hash_insert(HASH *info,const uchar *data);
-+my_bool hash_delete(HASH *hash,uchar *record);
-+my_bool hash_update(HASH *hash,uchar *record,uchar *old_key,uint old_key_length);
- my_bool hash_check(HASH *hash); /* Only in debug library */
-
- #define hash_clear(H) bzero((char*) (H),sizeof(*(H)))
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/ma_common.h mariadb-native-client.trunk/include/ma_common.h
---- mariadb/include/ma_common.h 1970-01-01 01:00:00.000000000 +0100
-+++ mariadb/include/ma_common.h 2013-10-19 07:29:16.000000000 +0200
-@@ -0,0 +1,52 @@
-+/* Copyright (C) 2013 by MontyProgram AB
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public
-+ License along with this library; if not, write to the Free
-+ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-+ MA 02111-1307, USA */
-+
-+/* defines for the libmariadb library */
-+
-+#ifndef _ma_common_h
-+#define _ma_common_h
-+
-+#include <mysql.h>
-+#include <hash.h>
-+
-+
-+typedef struct st_mariadb_db_driver
-+{
-+ struct st_mariadb_client_plugin_DB *plugin;
-+ char *name;
-+ void *buffer;
-+} MARIADB_DB_DRIVER;
-+
-+struct st_mysql_options_extention {
-+ char *plugin_dir;
-+ char *default_auth;
-+ char *ssl_crl;
-+ char *ssl_crlpath;
-+ char *server_public_key_path;
-+ HASH connect_attrs;
-+ size_t connect_attrs_len;
-+ void (*report_progress)(const MYSQL *mysql,
-+ unsigned int stage,
-+ unsigned int max_stage,
-+ double progress,
-+ const char *proc_info,
-+ unsigned int proc_info_length);
-+ MARIADB_DB_DRIVER *db_driver;
-+};
-+
-+
-+#endif
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/ma_dyncol.h mariadb-native-client.trunk/include/ma_dyncol.h
---- mariadb/include/ma_dyncol.h 1970-01-01 01:00:00.000000000 +0100
-+++ mariadb/include/ma_dyncol.h 2013-10-19 07:29:16.000000000 +0200
-@@ -0,0 +1,244 @@
-+/* Copyright (c) 2011, Monty Program Ab
-+ Copyright (c) 2011, Oleksandr Byelkin
-+
-+ Redistribution and use in source and binary forms, with or without
-+ modification, are permitted provided that the following conditions are
-+ met:
-+
-+ 1. Redistributions of source code must retain the above copyright
-+ notice, this list of conditions and the following disclaimer.
-+
-+ 2. Redistributions in binary form must the following disclaimer in
-+ the documentation and/or other materials provided with the
-+ distribution.
-+
-+ THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ``AS IS'' AND ANY
-+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
-+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+ SUCH DAMAGE.
-+*/
-+
-+#ifndef ma_dyncol_h
-+#define ma_dyncol_h
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+#ifndef LIBMARIADB
-+#include <decimal.h>
-+#include <my_decimal_limits.h>
-+#endif
-+#include <mysql.h>
-+
-+#ifndef _my_sys_h
-+typedef struct st_dynamic_string
-+{
-+ char *str;
-+ size_t length,max_length,alloc_increment;
-+} DYNAMIC_STRING;
-+#endif
-+
-+struct st_mysql_lex_string
-+{
-+ char *str;
-+ size_t length;
-+};
-+typedef struct st_mysql_lex_string MYSQL_LEX_STRING;
-+typedef struct st_mysql_lex_string LEX_STRING;
-+/*
-+ Limits of implementation
-+*/
-+#define MAX_TOTAL_NAME_LENGTH 65535
-+#define MAX_NAME_LENGTH (MAX_TOTAL_NAME_LENGTH/4)
-+
-+/* NO and OK is the same used just to show semantics */
-+#define ER_DYNCOL_NO ER_DYNCOL_OK
-+
-+enum enum_dyncol_func_result
-+{
-+ ER_DYNCOL_OK= 0,
-+ ER_DYNCOL_YES= 1, /* For functions returning 0/1 */
-+ ER_DYNCOL_FORMAT= -1, /* Wrong format of the encoded string */
-+ ER_DYNCOL_LIMIT= -2, /* Some limit reached */
-+ ER_DYNCOL_RESOURCE= -3, /* Out of resourses */
-+ ER_DYNCOL_DATA= -4, /* Incorrect input data */
-+ ER_DYNCOL_UNKNOWN_CHARSET= -5, /* Unknown character set */
-+ ER_DYNCOL_TRUNCATED= 2 /* OK, but data was truncated */
-+};
-+
-+typedef DYNAMIC_STRING DYNAMIC_COLUMN;
-+
-+enum enum_dynamic_column_type
-+{
-+ DYN_COL_NULL= 0,
-+ DYN_COL_INT,
-+ DYN_COL_UINT,
-+ DYN_COL_DOUBLE,
-+ DYN_COL_STRING,
-+ DYN_COL_DECIMAL,
-+ DYN_COL_DATETIME,
-+ DYN_COL_DATE,
-+ DYN_COL_TIME,
-+ DYN_COL_DYNCOL
-+};
-+
-+typedef enum enum_dynamic_column_type DYNAMIC_COLUMN_TYPE;
-+
-+struct st_dynamic_column_value
-+{
-+ DYNAMIC_COLUMN_TYPE type;
-+ union
-+ {
-+ long long long_value;
-+ unsigned long long ulong_value;
-+ double double_value;
-+ struct {
-+ MYSQL_LEX_STRING value;
-+ CHARSET_INFO *charset;
-+ } string;
-+#ifndef LIBMARIADB
-+ struct {
-+ decimal_digit_t buffer[DECIMAL_BUFF_LENGTH];
-+ decimal_t value;
-+ } decimal;
-+#endif
-+ MYSQL_TIME time_value;
-+ } x;
-+};
-+
-+typedef struct st_dynamic_column_value DYNAMIC_COLUMN_VALUE;
-+
-+#ifdef MADYNCOL_DEPRECATED
-+enum enum_dyncol_func_result
-+dynamic_column_create(DYNAMIC_COLUMN *str,
-+ uint column_nr, DYNAMIC_COLUMN_VALUE *value);
-+
-+enum enum_dyncol_func_result
-+dynamic_column_create_many(DYNAMIC_COLUMN *str,
-+ uint column_count,
-+ uint *column_numbers,
-+ DYNAMIC_COLUMN_VALUE *values);
-+enum enum_dyncol_func_result
-+dynamic_column_update(DYNAMIC_COLUMN *org, uint column_nr,
-+ DYNAMIC_COLUMN_VALUE *value);
-+enum enum_dyncol_func_result
-+dynamic_column_update_many(DYNAMIC_COLUMN *str,
-+ uint add_column_count,
-+ uint *column_numbers,
-+ DYNAMIC_COLUMN_VALUE *values);
-+
-+enum enum_dyncol_func_result
-+dynamic_column_exists(DYNAMIC_COLUMN *org, uint column_nr);
-+
-+enum enum_dyncol_func_result
-+dynamic_column_list(DYNAMIC_COLUMN *org, DYNAMIC_ARRAY *array_of_uint);
-+
-+enum enum_dyncol_func_result
-+dynamic_column_get(DYNAMIC_COLUMN *org, uint column_nr,
-+ DYNAMIC_COLUMN_VALUE *store_it_here);
-+#endif
-+
-+/* new functions */
-+enum enum_dyncol_func_result
-+mariadb_dyncol_create_many_num(DYNAMIC_COLUMN *str,
-+ uint column_count,
-+ uint *column_numbers,
-+ DYNAMIC_COLUMN_VALUE *values,
-+ my_bool new_string);
-+enum enum_dyncol_func_result
-+mariadb_dyncol_create_many_named(DYNAMIC_COLUMN *str,
-+ uint column_count,
-+ MYSQL_LEX_STRING *column_keys,
-+ DYNAMIC_COLUMN_VALUE *values,
-+ my_bool new_string);
-+
-+
-+enum enum_dyncol_func_result
-+mariadb_dyncol_update_many_num(DYNAMIC_COLUMN *str,
-+ uint add_column_count,
-+ uint *column_keys,
-+ DYNAMIC_COLUMN_VALUE *values);
-+enum enum_dyncol_func_result
-+mariadb_dyncol_update_many_named(DYNAMIC_COLUMN *str,
-+ uint add_column_count,
-+ MYSQL_LEX_STRING *column_keys,
-+ DYNAMIC_COLUMN_VALUE *values);
-+
-+
-+enum enum_dyncol_func_result
-+mariadb_dyncol_exists_num(DYNAMIC_COLUMN *org, uint column_nr);
-+enum enum_dyncol_func_result
-+mariadb_dyncol_exists_named(DYNAMIC_COLUMN *str, MYSQL_LEX_STRING *name);
-+
-+/* List of not NULL columns */
-+enum enum_dyncol_func_result
-+mariadb_dyncol_list_num(DYNAMIC_COLUMN *str, uint *count, uint **nums);
-+enum enum_dyncol_func_result
-+mariadb_dyncol_list_named(DYNAMIC_COLUMN *str, uint *count,
-+ MYSQL_LEX_STRING **names);
-+
-+/*
-+ if the column do not exists it is NULL
-+*/
-+enum enum_dyncol_func_result
-+mariadb_dyncol_get_num(DYNAMIC_COLUMN *org, uint column_nr,
-+ DYNAMIC_COLUMN_VALUE *store_it_here);
-+enum enum_dyncol_func_result
-+mariadb_dyncol_get_named(DYNAMIC_COLUMN *str, MYSQL_LEX_STRING *name,
-+ DYNAMIC_COLUMN_VALUE *store_it_here);
-+
-+my_bool mariadb_dyncol_has_names(DYNAMIC_COLUMN *str);
-+
-+enum enum_dyncol_func_result
-+mariadb_dyncol_check(DYNAMIC_COLUMN *str);
-+
-+enum enum_dyncol_func_result
-+mariadb_dyncol_json(DYNAMIC_COLUMN *str, DYNAMIC_STRING *json);
-+
-+void mariadb_dyncol_free(DYNAMIC_COLUMN *str);
-+
-+#define mariadb_dyncol_init(A) memset((A), 0, sizeof(DYNAMIC_COLUMN))
-+#define dynamic_column_initialize(A) mariadb_dyncol_init((A))
-+#define dynamic_column_column_free(A) mariadb_dyncol_free((A))
-+
-+/* conversion of values to 3 base types */
-+enum enum_dyncol_func_result
-+mariadb_dyncol_val_str(DYNAMIC_STRING *str, DYNAMIC_COLUMN_VALUE *val,
-+ CHARSET_INFO *cs, my_bool quote);
-+enum enum_dyncol_func_result
-+mariadb_dyncol_val_long(longlong *ll, DYNAMIC_COLUMN_VALUE *val);
-+enum enum_dyncol_func_result
-+mariadb_dyncol_val_double(double *dbl, DYNAMIC_COLUMN_VALUE *val);
-+
-+enum enum_dyncol_func_result
-+mariadb_dyncol_unpack(DYNAMIC_COLUMN *str,
-+ uint *count,
-+ MYSQL_LEX_STRING **names, DYNAMIC_COLUMN_VALUE **vals);
-+
-+int mariadb_dyncol_column_cmp_named(const MYSQL_LEX_STRING *s1,
-+ const MYSQL_LEX_STRING *s2);
-+
-+enum enum_dyncol_func_result
-+mariadb_dyncol_column_count(DYNAMIC_COLUMN *str, uint *column_count);
-+
-+#define mariadb_dyncol_value_init(V) (V)->type= DYN_COL_NULL
-+
-+/*
-+ Prepare value for using as decimal
-+*/
-+void mariadb_dyncol_prepare_decimal(DYNAMIC_COLUMN_VALUE *value);
-+
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/ma_secure.h mariadb-native-client.trunk/include/ma_secure.h
---- mariadb/include/ma_secure.h 1970-01-01 01:00:00.000000000 +0100
-+++ mariadb/include/ma_secure.h 2013-10-19 07:29:16.000000000 +0200
-@@ -0,0 +1,44 @@
-+/************************************************************************************
-+ Copyright (C) 2012 Monty Program AB
-+
-+ This library is free software; you can redistribute it and/or
-+ modify it under the terms of the GNU Library General Public
-+ License as published by the Free Software Foundation; either
-+ version 2 of the License, or (at your option) any later version.
-+
-+ This library is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ Library General Public License for more details.
-+
-+ You should have received a copy of the GNU Library General Public
-+ License along with this library; if not see <http://www.gnu.org/licenses>
-+ or write to the Free Software Foundation, Inc.,
-+ 51 Franklin St., Fifth Floor, Boston, MA 02110, USA
-+
-+ Part of this code includes code from the PHP project which
-+ is freely available from http://www.php.net
-+*************************************************************************************/
-+#ifndef _ma_secure_h_
-+#define _ma_secure_h_
-+
-+#ifdef HAVE_OPENSSL
-+#include <mysql.h>
-+#include <openssl/ssl.h> /* SSL and SSL_CTX */
-+#include <openssl/err.h> /* error reporting */
-+#include <openssl/conf.h>
-+
-+struct MYSQL;
-+
-+size_t my_ssl_read(Vio *vio, uchar* buf, size_t size);
-+int my_ssl_close(Vio *vio);
-+size_t my_ssl_write(Vio *vio, const uchar* buf, size_t size);
-+SSL *my_ssl_init(MYSQL *mysql);
-+int my_ssl_connect(SSL *ssl);
-+int my_ssl_verify_server_cert(SSL *ssl);
-+
-+int my_ssl_start(MYSQL *mysql);
-+void my_ssl_end(void);
-+
-+#endif /* HAVE_OPENSSL */
-+#endif /* _ma_secure_h_ */
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/m_ctype.h mariadb-native-client.trunk/include/m_ctype.h
---- mariadb/include/m_ctype.h 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/include/m_ctype.h 2013-10-19 07:29:16.000000000 +0200
-@@ -32,28 +32,42 @@
- #define CHARSET_DIR "charsets/"
- #define MY_CS_NAME_SIZE 32
-
-+#define MADB_DEFAULT_CHARSET_NAME "latin1"
-+#define MADB_DEFAULT_COLLATION_NAME "latin1_swedish_ci"
-
- /* we use the mysqlnd implementation */
- typedef struct charset_info_st
- {
-- uint nr; /* so far only 1 byte for charset */
-- uint state;
-+ unsigned int nr; /* so far only 1 byte for charset */
-+ unsigned int state;
- char *csname;
- char *name;
-- char *comment;
- char *dir;
-- uint char_minlen;
-- uint char_maxlen;
-- uint (*mb_charlen)(uint c);
-- uint (*mb_valid)(const char *start, const char *end);
-+ char *encoding;
-+ unsigned int char_minlen;
-+ unsigned int char_maxlen;
-+ unsigned int (*mb_charlen)(unsigned int c);
-+ unsigned int (*mb_valid)(const char *start, const char *end);
- } CHARSET_INFO;
-
- extern const CHARSET_INFO compiled_charsets[];
- extern CHARSET_INFO *default_charset_info;
-+extern CHARSET_INFO *my_charset_bin;
-+extern CHARSET_INFO *my_charset_latin1;
-+extern CHARSET_INFO *my_charset_utf8_general_ci;
-
--CHARSET_INFO *find_compiled_charset(uint cs_number);
-+CHARSET_INFO *find_compiled_charset(unsigned int cs_number);
- CHARSET_INFO *find_compiled_charset_by_name(const char *name);
-
- size_t mysql_cset_escape_quotes(const CHARSET_INFO *cset, char *newstr, const char *escapestr, size_t escapestr_len);
- size_t mysql_cset_escape_slashes(const CHARSET_INFO *cset, char *newstr, const char *escapestr, size_t escapestr_len);
-+char* madb_get_os_character_set(void);
-+#ifdef _WIN32
-+int madb_get_windows_cp(const char *charset);
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
- #endif
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/m_string.h mariadb-native-client.trunk/include/m_string.h
---- mariadb/include/m_string.h 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/include/m_string.h 2013-10-19 07:29:16.000000000 +0200
-@@ -88,9 +88,6 @@
-
- #if defined(HAVE_STPCPY) && !defined(HAVE_mit_thread)
- #define strmov(A,B) stpcpy((A),(B))
--#ifndef stpcpy
--extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */
--#endif
- #endif
-
- extern char NEAR _dig_vec[]; /* Declared in int2str() */
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/my_config.h.in mariadb-native-client.trunk/include/my_config.h.in
---- mariadb/include/my_config.h.in 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/include/my_config.h.in 2013-10-19 07:29:16.000000000 +0200
-@@ -1,6 +1,4 @@
-
--#define HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE 1
--
- /*
- * Include file constants (processed in LibmysqlIncludeFiles.txt 1
- */
-@@ -137,6 +135,7 @@
- #cmakedefine HAVE_SIGWAIT 1
- #cmakedefine HAVE_SLEEP 1
- #cmakedefine HAVE_SNPRINTF 1
-+#cmakedefine HAVE_SQLITE 1
- #cmakedefine HAVE_STPCPY 1
- #cmakedefine HAVE_STRERROR 1
- #cmakedefine HAVE_STRLCPY 1
-@@ -275,3 +274,5 @@
- #cmakedefine HAVE_THREADS 1
- #cmakedefine SHAREDIR "@SHAREDIR@"
- #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@"
-+#cmakedefine PLUGINDIR "@PLUGINDIR@"
-+
-diff -x .bzr -u --recursive -N mariadb-native-client.release/include/my_global.h mariadb-native-client.trunk/include/my_global.h
---- mariadb/include/my_global.h 2013-10-19 08:05:08.000000000 +0200
-+++ mariadb/include/my_global.h 2013-10-19 07:29:16.000000000 +0200
-@@ -326,13 +326,6 @@
- #define DBUG_OFF
- #endif
-
--#include <dbug.h>
--#ifndef DBUG_OFF
--#define dbug_assert(A) assert(A)
--#else
--#define dbug_assert(A)
--#endif
--
- #define MIN_ARRAY_SIZE 0 /* Zero or One. Gcc allows zero*/
- #define ASCII_BITS_USED 8 /* Bit char used */
- #define NEAR_F /* No near function handling */
-@@ -347,7 +340,7 @@
- #endif
- /* Type for fuctions that handles signals */
- #define sig_handler RETSIGTYPE
--typedef void (*sig_return)();/* Returns type from signal */
-+typedef void (*sig_return)(void);/* Returns type from signal */
- #if defined(__GNUC__) && !defined(_lint)
- typedef char pchar; /* Mixed prototypes can take char */
- typedef char puchar; /* Mixed prototypes can take char */
-@@ -446,11 +439,7 @@
- How much overhead does malloc have. The code often allocates
- something like 1024-MALLOC_OVERHEAD bytes
- */
--#ifdef SAFEMALLOC
--#define MALLOC_OVERHEAD (8+24+4)
--#else
- #define MALLOC_OVERHEAD 8
--#endif
- /* get memory in huncs */
- #define ONCE_ALLOC_INIT (uint) (4096-MALLOC_OVERHEAD)
- /* Typical record cash */
-@@ -510,6 +499,14 @@
- /* #define sigset(A,B) signal((A),(B)) */
- #endif
-
-+#if defined(_lint) || defined(FORCE_INIT_OF_VARS) || \
-+ defined(__cplusplus) || !defined(__GNUC__)
-+#define UNINIT_VAR(x) x= 0
-+#else
-+/* GCC specific self-initialization which inhibits the warning. */
-+#define UNINIT_VAR(x) x= x
-+#endif
-+
- /* Remove some things that mit_thread break or doesn't support */
- #if defined(HAVE_mit_thread) && defined(THREAD)
- #undef HAVE_PREAD
-@@ -532,25 +529,20 @@
- #define LONGLONG_MAX ((long long) 0x7FFFFFFFFFFFFFFFLL)
- #endif
-
--#if SIZEOF_LONG == 4
--#define INT_MIN32 (long) 0x80000000L
--#define INT_MAX32 (long) 0x7FFFFFFFL
-+#define INT_MIN64 (~0x7FFFFFFFFFFFFFFFLL)
-+#define INT_MAX64 0x7FFFFFFFFFFFFFFFLL
-+#define INT_MIN32 (~0x7FFFFFFFL)
-+#define INT_MAX32 0x7FFFFFFFL
- #define UINT_MAX32 0xFFFFFFFFL
--#define INT_MIN24 ((long) 0xff800000L)
--#define INT_MAX24 0x007fffffL
--#define INT_MIN16 ((short int) 0x8000)
--#define INT_MAX16 0x7FFF
--#define UINT_MAX16 0xFFFF
--#define INT_MIN8 ((char) 0x80)
--#define INT_MAX8 ((char) 0x7F)
--#else /* Probably Alpha */
--#define INT_MIN32 ((long) (int) 0x80000000)
--#define INT_MAX32 ((long) (int) 0x7FFFFFFF)
--#define INT_MIN24 ((long) (int) 0xff800000)
--#define INT_MAX24 ((long) (int) 0x007fffff)
--#define INT_MIN16 ((short int) 0xffff8000)
--#define INT_MAX16 ((short int) 0x00007FFF)
--#endif
-+#define INT_MIN24 (~0x007FFFFF)
-+#define INT_MAX24 0x007FFFFF
-+#define UINT_MAX24 0x00FFFFFF
-+#define INT_MIN16 (~0x7FFF)
-+#define INT_MAX16 0x7FFF
-+#define UINT_MAX16 0xFFFF
-+#define INT_MIN8 (~0x7F)
-+#define INT_MAX8 0x7F
-+#define UINT_MAX8 0xFF
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list