database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

fixes for buildbot.

Browse Source 
increase the version.
This commit is contained in:
Sergei Golubchik
2013-04-21 09:38:54 -07:00
parent b44f11c994
commit 88b89aaa82
5 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -4,5 +4,5 @@
# #
MYSQL_VERSION_MAJOR=10 MYSQL_VERSION_MAJOR=10
MYSQL_VERSION_MINOR=0 MYSQL_VERSION_MINOR=0
MYSQL_VERSION_PATCH=1 MYSQL_VERSION_PATCH=2
MYSQL_VERSION_EXTRA= MYSQL_VERSION_EXTRA=

1
cmake/zlib.cmake
View File

@@ -51,7 +51,6 @@ MACRO (MYSQL_CHECK_ZLIB_WITH_COMPRESS)
IF(WITH_ZLIB STREQUAL "bundled") IF(WITH_ZLIB STREQUAL "bundled")
MYSQL_USE_BUNDLED_ZLIB() MYSQL_USE_BUNDLED_ZLIB()
ELSE() ELSE()
SET(ZLIB_FIND_QUIETLY TRUE)
INCLUDE(FindZLIB) INCLUDE(FindZLIB)
IF(ZLIB_FOUND) IF(ZLIB_FOUND)
INCLUDE(CheckFunctionExists) INCLUDE(CheckFunctionExists)

18
storage/connect/CMakeLists.txt
View File

@@ -57,7 +57,7 @@ IF(UNIX)
add_definitions(-Wno-unused-value) add_definitions(-Wno-unused-value)
add_definitions(-Wno-unused-function) add_definitions(-Wno-unused-function)
add_definitions(-Wno-parentheses) add_definitions(-Wno-parentheses)
add_definitions(-Wno-missing-declarations) #add_definitions(-Wno-missing-declarations)
# Bar: -Wno-int-to-pointer-cast commended (does not present in gcc on sol10) # Bar: -Wno-int-to-pointer-cast commended (does not present in gcc on sol10)
# add_definitions(-Wno-int-to-pointer-cast) # add_definitions(-Wno-int-to-pointer-cast)
# Bar: -Wno-narrowing commented (does not present in gcc on solaris10) # Bar: -Wno-narrowing commented (does not present in gcc on solaris10)
@@ -234,6 +234,22 @@ IF(CONNECT_WITH_ODBC)
) )
IF(ODBC_INCLUDE_DIR AND ODBC_LIBRARY) IF(ODBC_INCLUDE_DIR AND ODBC_LIBRARY)
set(CMAKE_REQUIRED_INCLUDES ${ODBC_INCLUDE_DIR})
CHECK_CXX_SOURCE_COMPILES(
"
#include <stdio.h>
#include <sql.h>
#include <sqlext.h>
typedef long BOOL; /* this fails with iODBC */
int main() {
SQLULEN rowofs= 0; /* this fails on older unixODBC */
SQLExtendedFetch(NULL, 0, 0, &rowofs, NULL);
return 0;
}
" ODBC_OK)
ENDIF()
IF(ODBC_OK)
INCLUDE_DIRECTORIES(${ODBC_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${ODBC_INCLUDE_DIR})
add_definitions(-DODBC_SUPPORT) add_definitions(-DODBC_SUPPORT)
SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabodbc.cpp odbconn.cpp) SET(CONNECT_SOURCES ${CONNECT_SOURCES} tabodbc.cpp odbconn.cpp)

2
storage/connect/os.h
View File

@@ -1,7 +1,7 @@
#ifndef _OS_H_INCLUDED #ifndef _OS_H_INCLUDED
#define _OS_H_INCLUDED #define _OS_H_INCLUDED
#if defined __FreeBSD__ #if defined(__FreeBSD__) || defined(__APPLE__)
typedef off_t off64_t; typedef off_t off64_t;
#define lseek64(fd, offset, whence) lseek((fd), (offset), (whence)) #define lseek64(fd, offset, whence) lseek((fd), (offset), (whence))
#define open64(path, flags, mode) open((path), (flags), (mode)) #define open64(path, flags, mode) open((path), (flags), (mode))

20
storage/connect/value.cpp
View File

@@ -1243,11 +1243,11 @@ bool DTVAL::SetFormat(PGLOBAL g, PVAL valp)
/***********************************************************************/ /***********************************************************************/
void DTVAL::SetTimeShift(void) void DTVAL::SetTimeShift(void)
{ {
#if defined(WIN32) struct tm dtm;
struct tm dtm = {0,0,0,2,0,70,0,0,0}; memset(&dtm, 0, sizeof(dtm));
#else // !WIN32 dtm.tm_mday=2;
struct tm dtm = {0,0,0,2,0,70,0,0,0,0,0}; dtm.tm_mon=0;
#endif // !WIN32 dtm.tm_year=70;
Shift = (int)mktime(&dtm) - 86400; Shift = (int)mktime(&dtm) - 86400;
@@ -1369,11 +1369,11 @@ bool DTVAL::MakeDate(PGLOBAL g, int *val, int nval)
int i, m; int i, m;
int n; int n;
bool rc = false; bool rc = false;
#if defined(WIN32) struct tm datm;
struct tm datm = {0,0,0,1,0,70,0,0,0}; bzero(&datm, sizeof(datm));
#else // !WIN32 datm.tm_mday=1;
struct tm datm = {0,0,0,1,0,70,0,0,0,0,0}; datm.tm_mon=0;
#endif // !WIN32 datm.tm_year=70;
if (trace) if (trace)
htrc("MakeDate from(%d,%d,%d,%d,%d,%d) nval=%d\n", htrc("MakeDate from(%d,%d,%d,%d,%d,%d) nval=%d\n",