Bug#16792349: YET MORE UNUSED #IFDEFS

Additional patch mysql#2, remove the following #ifdefs:
__bsdi__
__EMX__
__IBMC__
__IBMCPP__
__LCC__
__OpenBSD__
__STDC_EXT__
_CUSTOMSTARTUPCONFIG_
CANT_OPEN_FILES_TWICE
CHECK_KEYS
COMPILE_STOPWORDS_IN
DEAD_CODE
DONT_USE_RW_LOCKS
FAST
FORCE_PRIMARY_KEY
N_MAXKEY
NEW_HASH_FUNCTION
NOT_ANYMORE
NOT_REALLY_USED_YET
NOT_YET_READY_FOR_8_BYTE_POINTERS
UNSAFE_LOCKING
USE_RELOC
USING_SECOND_APPROACH
XXX_SUPERCEDED_BY_WL2952

Author: jhauglid

client/mysqldump.c

@@ -2997,10 +2997,6 @@ static uint get_table_structure(char *table, char *db, char *table_type,
         if (atoi(row[3]) == 1)
         {
           keynr++;
-#ifdef FORCE_PRIMARY_KEY
-          if (atoi(row[1]) == 0 && primary_key == INT_MAX)
-            primary_key=keynr;
-#endif
           if (!strcmp(row[2],"PRIMARY"))
           {
             primary_key=keynr;
@@ -5535,11 +5531,6 @@ static my_bool get_view_structure(char *table, char* db)
 
   verbose_msg("-- Retrieving view structure for table %s...\n", table);
 
-#ifdef NOT_REALLY_USED_YET
-  sprintf(insert_pat,"SET SQL_QUOTE_SHOW_CREATE=%d",
-          (opt_quoted || opt_keywords));
-#endif
-
   result_table=     quote_name(table, table_buff, 1);
   opt_quoted_table= quote_name(table, table_buff2, 0);
 

include/my_global.h

@@ -141,9 +141,6 @@
 #endif
 
 #define __EXTENSIONS__ 1	/* We want some extension */
-#ifndef __STDC_EXT__
-#define __STDC_EXT__ 1          /* To get large file support on hpux */
-#endif
 
 /*
   Solaris 9 include file <sys/feature_tests.h> refers to X/Open document

include/mysql.h

@@ -34,9 +34,6 @@ extern "C" {
 #ifndef MYSQL_ABI_CHECK
 #include <sys/types.h>
 #endif
-#ifdef __LCC__
-#include <winsock2.h>				/* For windows */
-#endif
 typedef char my_bool;
 #if !defined(_WIN32)
 #define STDCALL

mysys/my_access.c

@@ -216,7 +216,7 @@ my_bool is_filename_allowed(const char *name __attribute__((unused)),
 } /* is_filename_allowed */
 #endif  /* _WIN32 */
 
-#if defined(_WIN32) || defined(__EMX__)
+#if defined(_WIN32)
 
 
 /*
@@ -262,4 +262,4 @@ int check_if_legal_filename(const char *path)
   DBUG_RETURN(0);
 }
 
-#endif /* defined(_WIN32) || defined(__EMX__) */
+#endif /* defined(_WIN32) */

mysys/my_thr_init.c

@@ -401,10 +401,7 @@ void my_thread_end(void)
       tmp->dbug=0;
     }
 #endif
-#if !defined(__bsdi__) && !defined(__OpenBSD__)
- /* bsdi and openbsd 3.5 dumps core here */
     mysql_cond_destroy(&tmp->suspend);
-#endif
     mysql_mutex_destroy(&tmp->mutex);
     free(tmp);
 

mysys/thr_alarm.c

@@ -273,7 +273,7 @@ sig_handler process_alarm(int sig __attribute__((unused)))
   if (thd_lib_detected == THD_LIB_LT &&
       !pthread_equal(pthread_self(),alarm_thread))
   {
-#if defined(MAIN) && !defined(__bsdi__)
+#if defined(MAIN)
     printf("thread_alarm in process_alarm\n"); fflush(stdout);
 #endif
 #ifdef SIGNAL_HANDLER_RESET_ON_DELIVERY
@@ -307,7 +307,7 @@ static sig_handler process_alarm_part2(int sig __attribute__((unused)))
   DBUG_ENTER("process_alarm");
   DBUG_PRINT("info",("sig: %d  active alarms: %d",sig,alarm_queue.elements));
 
-#if defined(MAIN) && !defined(__bsdi__)
+#if defined(MAIN)
   printf("process_alarm\n"); fflush(stdout);
 #endif
   if (alarm_queue.elements)
@@ -359,9 +359,6 @@ static sig_handler process_alarm_part2(int sig __attribute__((unused)))
       }
       if (alarm_queue.elements)
       {
-#ifdef __bsdi__
-	alarm(0);				/* Remove old alarm */
-#endif
 	alarm((uint) (alarm_data->expire_time-now));
         next_alarm_expire_time= alarm_data->expire_time;
       }

mysys/thr_lock.c

@@ -1064,7 +1064,6 @@ thr_multi_lock(THR_LOCK_DATA **data, uint count, THR_LOCK_INFO *owner,
 void
 thr_lock_merge_status(THR_LOCK_DATA **data, uint count)
 {
-#if !defined(DONT_USE_RW_LOCKS)
   THR_LOCK_DATA **pos= data;
   THR_LOCK_DATA **end= data + count;
   if (count > 1)
@@ -1107,7 +1106,6 @@ thr_lock_merge_status(THR_LOCK_DATA **data, uint count)
 	last_lock=(*pos);
     } while (pos != data);
   }
-#endif
 }
 
   /* free all locks */

sql/mdl.h

@@ -15,15 +15,6 @@
    along with this program; if not, write to the Free Software Foundation,
    51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
-#if defined(__IBMC__) || defined(__IBMCPP__)
-/* Further down, "next_in_lock" and "next_in_context" have the same type,
-   and in "sql_plist.h" this leads to an identical signature, which causes
-   problems in function overloading.
-*/
-#pragma namemangling(v5)
-#endif
-
-
 #include "sql_plist.h"
 #include <my_sys.h>
 #include <m_string.h>

sql/mysqld.cc

@@ -1421,7 +1421,6 @@ static void close_connections(void)
   sql_print_information("Forcefully disconnecting %d remaining clients",
                         static_cast<int>(get_thread_count()));
 
-#ifndef __bsdi__ // Bug in BSDI kernel
   DBUG_PRINT("quit", ("Locking LOCK_thread_count"));
   mysql_mutex_lock(&LOCK_thread_count);
   for (it= global_thread_list->begin(); it != global_thread_list->end(); ++it)
@@ -1439,7 +1438,6 @@ static void close_connections(void)
   }
   DBUG_PRINT("quit",("Unlocking LOCK_thread_count"));
   mysql_mutex_unlock(&LOCK_thread_count);
-#endif // Bug in BSDI kernel
 
   /* 
     All threads have now been aborted. Stop event scheduler thread 
@@ -5183,14 +5181,6 @@ int mysqld_main(int argc, char **argv)
     exit (ho_error);
   }
 
-#ifdef _CUSTOMSTARTUPCONFIG_
-  if (_cust_check_startup())
-  {
-    / * _cust_check_startup will report startup failure error * /
-    exit(1);
-  }
-#endif
-
   if (init_common_variables())
     unireg_abort(1);        // Will do exit
 

storage/archive/ha_archive.cc

@@ -989,51 +989,6 @@ int ha_archive::write_row(uchar *buf)
       rc= HA_ERR_FOUND_DUPP_KEY;
       goto error;
     }
-#ifdef DEAD_CODE
-    /*
-      Bad news, this will cause a search for the unique value which is very 
-      expensive since we will have to do a table scan which will lock up 
-      all other writers during this period. This could perhaps be optimized 
-      in the future.
-    */
-    {
-      /* 
-        First we create a buffer that we can use for reading rows, and can pass
-        to get_row().
-      */
-      if (!(read_buf= (uchar*) my_malloc(table->s->reclength, MYF(MY_WME))))
-      {
-        rc= HA_ERR_OUT_OF_MEM;
-        goto error;
-      }
-       /* 
-         All of the buffer must be written out or we won't see all of the
-         data 
-       */
-      azflush(&(share->archive_write), Z_SYNC_FLUSH);
-      /*
-        Set the position of the local read thread to the beginning position.
-      */
-      if (read_data_header(&archive))
-      {
-        rc= HA_ERR_CRASHED_ON_USAGE;
-        goto error;
-      }
-
-      Field *mfield= table->next_number_field;
-
-      while (!(get_row(&archive, read_buf)))
-      {
-        if (!memcmp(read_buf + mfield->offset(record),
-                    table->next_number_field->ptr,
-                    mfield->max_display_length()))
-        {
-          rc= HA_ERR_FOUND_DUPP_KEY;
-          goto error;
-        }
-      }
-    }
-#endif
     else
     {
       if (temp_auto > share->archive_write.auto_increment)

storage/federated/ha_federated.cc

@@ -3283,63 +3283,6 @@ int ha_federated::external_lock(THD *thd, int lock_type)
   /*
     Support for transactions disabled until WL#2952 fixes it.
   */
-#ifdef XXX_SUPERCEDED_BY_WL2952
-  if (lock_type != F_UNLCK)
-  {
-    ha_federated *trx= (ha_federated *)thd_get_ha_data(thd, ht);
-
-    DBUG_PRINT("info",("federated not lock F_UNLCK"));
-    if (!(thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) 
-    {
-      DBUG_PRINT("info",("federated autocommit"));
-      /* 
-        This means we are doing an autocommit
-      */
-      error= connection_autocommit(TRUE);
-      if (error)
-      {
-        DBUG_PRINT("info", ("error setting autocommit TRUE: %d", error));
-        DBUG_RETURN(error);
-      }
-      trans_register_ha(thd, FALSE, ht);
-    }
-    else 
-    { 
-      DBUG_PRINT("info",("not autocommit"));
-      if (!trx)
-      {
-        /* 
-          This is where a transaction gets its start
-        */
-        error= connection_autocommit(FALSE);
-        if (error)
-        { 
-          DBUG_PRINT("info", ("error setting autocommit FALSE: %d", error));
-          DBUG_RETURN(error);
-        }
-        thd_set_ha_data(thd, ht, this);
-        trans_register_ha(thd, TRUE, ht);
-        /*
-          Send a lock table to the remote end.
-          We do not support this at the moment
-        */
-        if (thd->options & (OPTION_TABLE_LOCK))
-        {
-          DBUG_PRINT("info", ("We do not support lock table yet"));
-        }
-      }
-      else
-      {
-        ha_federated *ptr;
-        for (ptr= trx; ptr; ptr= ptr->trx_next)
-          if (ptr == this)
-            break;
-          else if (!ptr->trx_next)
-            ptr->trx_next= this;
-      }
-    }
-  }
-#endif /* XXX_SUPERCEDED_BY_WL2952 */
   DBUG_RETURN(error);
 }