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

into  zim.(none):/home/brian/mysql/remove-bdb-5.1

libmysqld/CMakeLists.txt

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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)
 

storage/csv/ha_tina.cc

@@ -1108,7 +1108,7 @@ int ha_tina::rnd_pos(byte * buf, byte *pos)
 {
   DBUG_ENTER("ha_tina::rnd_pos");
   ha_statistic_increment(&SSV::ha_read_rnd_next_count);
-  current_position= my_get_ptr(pos,ref_length);
+  current_position= (off_t)my_get_ptr(pos,ref_length);
   DBUG_RETURN(find_current_row(buf));
 }
 

storage/myisam/ft_parser.c

@@ -280,7 +280,7 @@ static int ft_add_word(MYSQL_FTPARSER_PARAM *param,
 
 
 static int ft_parse_internal(MYSQL_FTPARSER_PARAM *param,
-                             byte *doc, int doc_len)
+                             char *doc, int doc_len)
 {
   byte   *end=doc+doc_len;
   MY_FT_PARSER_PARAM *ft_param=param->mysql_ftparam;

storage/myisam/mi_delete_all.c

@@ -22,7 +22,6 @@
 int mi_delete_all_rows(MI_INFO *info)
 {
   uint i;
-  char buf[22];
   MYISAM_SHARE *share=info->s;
   MI_STATE_INFO *state=&share->state;
   DBUG_ENTER("mi_delete_all_rows");

storage/myisam/mi_packrec.c

@@ -1178,7 +1178,6 @@ static int _mi_read_rnd_mempack_record(MI_INFO*, byte *,my_off_t, my_bool);
 
 my_bool _mi_memmap_file(MI_INFO *info)
 {
-  byte *file_map;
   MYISAM_SHARE *share=info->s;
   DBUG_ENTER("mi_memmap_file");
 

win/README

@@ -39,7 +39,6 @@ The options right now are
     WITH_INNOBASE_STORAGE_ENGINE         Enable particular storage engines
     WITH_PARTITION_STORAGE_ENGINE
     WITH_ARCHIVE_STORAGE_ENGINE
-    WITH_BERKELEY_STORAGE_ENGINE
     WITH_BLACKHOLE_STORAGE_ENGINE
     WITH_EXAMPLE_STORAGE_ENGINE
     WITH_FEDERATED_STORAGE_ENGINE

win/configure.js

@@ -24,7 +24,6 @@ try
         switch (parts[0])
         {
             case "WITH_ARCHIVE_STORAGE_ENGINE":
-            case "WITH_BERKELEY_STORAGE_ENGINE":
             case "WITH_BLACKHOLE_STORAGE_ENGINE":
             case "WITH_EXAMPLE_STORAGE_ENGINE":
             case "WITH_FEDERATED_STORAGE_ENGINE":
@@ -66,8 +65,6 @@ try
 
     configfile.Close();
     
-    //ConfigureBDB();
-
     fso = null;
 
     WScript.Echo("done!");
@@ -135,32 +132,3 @@ function GetVersionId(version)
     id += build;
     return id;
 }
-
-function ConfigureBDB() 
-{
-    // read in the Unix configure.in file
-    var dbIncTS = fso.OpenTextFile("..\\bdb\\dbinc\\db.in", ForReading);
-    var dbIn = dbIncTS.ReadAll();
-    dbIncTS.Close();
-
-    dbIn = dbIn.replace("@DB_VERSION_MAJOR@", "$DB_VERSION_MAJOR");
-    dbIn = dbIn.replace("@DB_VERSION_MINOR@", "$DB_VERSION_MINOR");
-    dbIn = dbIn.replace("@DB_VERSION_PATCH@", "$DB_VERSION_PATCH");
-    dbIn = dbIn.replace("@DB_VERSION_STRING@", "$DB_VERSION_STRING");
-
-    dbIn = dbIn.replace("@u_int8_decl@", "typedef unsigned char u_int8_t;");
-    dbIn = dbIn.replace("@int16_decl@", "typedef short int16_t;");
-    dbIn = dbIn.replace("@u_int16_decl@", "typedef unsigned short u_int16_t;");
-    dbIn = dbIn.replace("@int32_decl@", "typedef int int32_t;");
-    dbIn = dbIn.replace("@u_int32_decl@", "typedef unsigned int u_int32_t;");
-
-    dbIn = dbIn.replace("@u_char_decl@", "{\r\n#if !defined(_WINSOCKAPI_)\r\n" +
-        "typedef unsigned char u_char;");
-    dbIn = dbIn.replace("@u_short_decl@", "typedef unsigned short u_short;");
-    dbIn = dbIn.replace("@u_int_decl@", "typedef unsigned int u_int;");
-    dbIn = dbIn.replace("@u_long_decl@", "typedef unsigned long u_long;");
-    
-    dbIn = dbIn.replace("@ssize_t_decl@", "#endif\r\n#if defined(_WIN64)\r\n" +
-        "typedef __int64 ssize_t;\r\n#else\r\n" +
-        "typedef int ssize_t;\r\n#endif");
-}