Commit c235176e authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 

into  zim.(none):/home/brian/mysql/remove-bdb-5.1
parents 4268f232 cd066443

libmysqld/CMakeLists.txt

+0 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                    ${CMAKE_SOURCE_DIR}/sql

                    ${CMAKE_SOURCE_DIR}/regex

                    ${CMAKE_SOURCE_DIR}/extra/yassl/include 

		    ${CMAKE_SOURCE_DIR}/storage/bdb/build_win32

                    ${CMAKE_SOURCE_DIR}/zlib 

)
@@ -84,9 +83,6 @@ ENDIF(WITH_EXAMPLE_STORAGE_ENGINE) 
IF(WITH_INNOBASE_STORAGE_ENGINE)

  ADD_DEPENDENCIES(mysqlserver innobase)

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

IF(WITH_BERKELEY_STORAGE_ENGINE)

  ADD_DEPENDENCIES(mysqlserver bdb)

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)



ADD_LIBRARY(libmysqld MODULE cmake_dummy.c libmysqld.def)

TARGET_LINK_LIBRARIES(libmysqld wsock32)

mysys/base64.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ base64_needed_encoded_length(int length_of_data) 
int

base64_needed_decoded_length(int length_of_encoded_data)

{

  return ceil(length_of_encoded_data * 3 / 4);

  return (int)ceil(length_of_encoded_data * 3 / 4);

}

mysys/my_pread.c

+2 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ uint my_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset, 
      before seeking to the given offset

    */



    error= (old_offset= lseek(Filedes, 0L, MY_SEEK_CUR)) == -1L ||

    error= (old_offset= (off_t)lseek(Filedes, 0L, MY_SEEK_CUR)) == -1L ||

           lseek(Filedes, offset, MY_SEEK_SET) == -1L;



    if (!error)                                 /* Seek was successful */
@@ -121,7 +121,7 @@ uint my_pwrite(int Filedes, const byte *Buffer, uint Count, my_off_t offset, 
      As we cannot change the file pointer, we save the old position,

      before seeking to the given offset

    */

    error= ((old_offset= lseek(Filedes, 0L, MY_SEEK_CUR)) == -1L ||

    error= ((old_offset= (off_t)lseek(Filedes, 0L, MY_SEEK_CUR)) == -1L ||

            lseek(Filedes, offset, MY_SEEK_SET) == -1L);



    if (!error)                                 /* Seek was successful */

sql-common/my_time.c

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time, 
    goto err;

  }



  if (check_date(l_time, not_zero_date, flags, was_cut))

  if ((my_bool)check_date(l_time, not_zero_date, flags, was_cut))

    goto err;



  l_time->time_type= (number_of_fields <= 3 ?

sql/CMakeLists.txt

+1 −5
Original line number Diff line number Diff line
@@ -8,8 +8,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
                    ${CMAKE_SOURCE_DIR}/sql 

                    ${CMAKE_SOURCE_DIR}/regex 

                    ${CMAKE_SOURCE_DIR}/zlib

                    ${CMAKE_SOURCE_DIR}/storage/bdb/build_win32

                    ${CMAKE_SOURCE_DIR}/storage/bdb/dbinc)

)



SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc 

							${CMAKE_SOURCE_DIR}/sql/message.h
@@ -79,9 +78,6 @@ ENDIF(WITH_EXAMPLE_STORAGE_ENGINE) 
IF(WITH_INNOBASE_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld innobase)

ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

IF(WITH_BERKELEY_STORAGE_ENGINE)

  TARGET_LINK_LIBRARIES(mysqld bdb)

ENDIF(WITH_BERKELEY_STORAGE_ENGINE)



ADD_DEPENDENCIES(mysqld GenError)