List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:November 21 2012 5:06pm
Subject:bzr push into mysql-trunk branch (jon.hauglid:5059 to 5060) Bug#15878828
View as plain text  
 5060 Jon Olav Hauglid	2012-11-21
      Bug#15878828: REMOVE OLD/UNUSED DEFINES
      
      This patch removes usage of the following #ifdefs
      __alpha__
      __amiga__
      USE_HALLOC
      TO_BE_REMOVED
      NOT_YET_IMPLEMENTED
      WILL_BE_DELETED_LATER
      TO_BE_DONE_LATER_IN_4_1
      CANT_BE_USED_AS_MEMORY_IS_FREED
      I_AM_PARANOID
      DONT_ALLOW_USER_CHANGE
      DONT_USE_MYSQL_PWD

    modified:
      client/mysql.cc
      client/mysqladmin.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqlslap.c
      client/sql_string.cc
      extra/yassl/taocrypt/include/types.hpp
      extra/yassl/taocrypt/src/integer.cpp
      include/my_global.h
      include/my_nosys.h
      include/my_stacktrace.h
      include/my_sys.h
      libmysqld/libmysqld.c
      mysys/my_lib.c
      mysys/my_malloc.c
      mysys/stacktrace.c
      sql-common/client.c
      sql/handler.cc
      sql/item.cc
      sql/mysqld.cc
      sql/sql_acl.cc
      sql/sql_tmp_table.cc
      storage/federated/ha_federated.cc
      tests/mysql_client_fw.c
 5059 kevin.lewis@stripped	2012-11-21 [merge]
      Merge 15882860 from mysql-5.6

    modified:
      storage/innobase/os/os0file.cc
=== modified file 'client/mysql.cc'
--- a/client/mysql.cc	2012-11-15 16:48:08 +0000
+++ b/client/mysql.cc	2012-11-21 17:05:35 +0000
@@ -1739,10 +1739,8 @@ static struct my_option my_long_options[
    "Does not work in batch mode. Disable with --disable-tee. "
    "This option is disabled by default.",
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#ifndef DONT_ALLOW_USER_CHANGE
   {"user", 'u', "User for login if not current user.", &current_user,
    &current_user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"safe-updates", 'U', "Only allow UPDATE and DELETE that uses keys.",
    &safe_updates, &safe_updates, 0, GET_BOOL, NO_ARG, 0, 0,
    0, 0, 0, 0},

=== modified file 'client/mysqladmin.cc'
--- a/client/mysqladmin.cc	2012-11-06 14:16:49 +0000
+++ b/client/mysqladmin.cc	2012-11-21 17:05:35 +0000
@@ -195,10 +195,8 @@ static struct my_option my_long_options[
    &interval, &interval, 0, GET_INT, REQUIRED_ARG, 0, 0, 0, 0,
    0, 0},
 #include <sslopt-longopts.h>
-#ifndef DONT_ALLOW_USER_CHANGE
   {"user", 'u', "User for login if not current user.", &user,
    &user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"verbose", 'v', "Write more information.", &opt_verbose,
    &opt_verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,

=== modified file 'client/mysqlcheck.c'
--- a/client/mysqlcheck.c	2012-11-19 13:45:52 +0000
+++ b/client/mysqlcheck.c	2012-11-21 17:05:35 +0000
@@ -185,10 +185,8 @@ static struct my_option my_long_options[
    "When used with REPAIR, get table structure from .frm file, so the table can be repaired even if .MYI header is corrupted.",
    &opt_frm, &opt_frm, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0,
    0},
-#ifndef DONT_ALLOW_USER_CHANGE
   {"user", 'u', "User for login if not current user.", &current_user,
    &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"verbose", 'v', "Print info about the various stages.", 0, 0, 0, GET_NO_ARG,
    NO_ARG, 0, 0, 0, 0, 0, 0},
   {"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,

=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c	2012-11-19 16:20:34 +0000
+++ b/client/mysqldump.c	2012-11-21 17:05:35 +0000
@@ -525,11 +525,9 @@ static struct my_option my_long_options[
   {"tz-utc", OPT_TZ_UTC,
     "SET TIME_ZONE='+00:00' at top of dump to allow dumping of TIMESTAMP data when a server has data in different time zones or data is being moved between servers with different time zones.",
     &opt_tz_utc, &opt_tz_utc, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
-#ifndef DONT_ALLOW_USER_CHANGE
   {"user", 'u', "User for login if not current user.",
    &current_user, &current_user, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
-#endif
   {"verbose", 'v', "Print info about the various stages.",
    &verbose, &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"version",'V', "Output version information and exit.", 0, 0, 0,

=== modified file 'client/mysqlimport.c'
--- a/client/mysqlimport.c	2012-11-06 14:16:49 +0000
+++ b/client/mysqlimport.c	2012-11-21 17:05:35 +0000
@@ -177,10 +177,8 @@ static struct my_option my_long_options[
    "of threads to use for loading data.",
    &opt_use_threads, &opt_use_threads, 0, 
    GET_UINT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#ifndef DONT_ALLOW_USER_CHANGE
   {"user", 'u', "User for login if not current user.", &current_user,
    &current_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"verbose", 'v', "Print info about the various stages.", &verbose,
    &verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,

=== modified file 'client/mysqlshow.c'
--- a/client/mysqlshow.c	2012-11-06 14:16:49 +0000
+++ b/client/mysqlshow.c	2012-11-21 17:05:35 +0000
@@ -257,10 +257,8 @@ static struct my_option my_long_options[
    &opt_mysql_unix_port, &opt_mysql_unix_port, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
-#ifndef DONT_ALLOW_USER_CHANGE
   {"user", 'u', "User for login if not current user.", &user,
    &user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"verbose", 'v',
    "More verbose output; you can use this multiple times to get even more "
    "verbose output.",

=== modified file 'client/mysqlslap.c'
--- a/client/mysqlslap.c	2012-11-15 16:48:08 +0000
+++ b/client/mysqlslap.c	2012-11-21 17:05:35 +0000
@@ -697,10 +697,8 @@ static struct my_option my_long_options[
     &opt_mysql_unix_port, &opt_mysql_unix_port, 0, GET_STR,
     REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
-#ifndef DONT_ALLOW_USER_CHANGE
   {"user", 'u', "User for login if not current user.", &user,
     &user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"verbose", 'v',
    "More verbose output; you can use this multiple times to get even more "
    "verbose output.", &verbose, &verbose, 0, GET_NO_ARG, NO_ARG,

=== modified file 'client/sql_string.cc'
--- a/client/sql_string.cc	2012-11-15 16:48:08 +0000
+++ b/client/sql_string.cc	2012-11-21 17:05:35 +0000
@@ -434,21 +434,6 @@ bool String::append(const char *s,uint32
 }
 
 
-#ifdef TO_BE_REMOVED
-bool String::append(FILE* file, uint32 arg_length, myf my_flags)
-{
-  if (realloc(str_length+arg_length))
-    return TRUE;
-  if (my_fread(file, (uchar*) Ptr + str_length, arg_length, my_flags))
-  {
-    shrink(str_length);
-    return TRUE;
-  }
-  str_length+=arg_length;
-  return FALSE;
-}
-#endif
-
 bool String::append(IO_CACHE* file, uint32 arg_length)
 {
   if (realloc(str_length+arg_length))

=== modified file 'extra/yassl/taocrypt/include/types.hpp'
--- a/extra/yassl/taocrypt/include/types.hpp	2012-11-06 14:16:49 +0000
+++ b/extra/yassl/taocrypt/include/types.hpp	2012-11-21 17:05:35 +0000
@@ -67,7 +67,7 @@ typedef unsigned int   word32;
 #endif
 
     
-#if defined(HAVE_64_MULTIPLY) && (defined(__alpha__) || defined(__ia64__) \
+#if defined(HAVE_64_MULTIPLY) && (defined(__ia64__) \
     || defined(_ARCH_PPC64) || defined(__mips64)  || defined(__x86_64__) \
     || defined(_M_X64) || defined(_M_IA64)) 
 // These platforms have 64-bit CPU registers. Unfortunately most C++ compilers

=== modified file 'extra/yassl/taocrypt/src/integer.cpp'
--- a/extra/yassl/taocrypt/src/integer.cpp	2012-11-06 14:16:49 +0000
+++ b/extra/yassl/taocrypt/src/integer.cpp	2012-11-21 17:05:35 +0000
@@ -161,17 +161,6 @@ DWord() {}
         #elif defined(_M_X64) || defined(_M_IA64)
             r.halfs_.low = _umul128(a, b, &r.halfs_.high);
 
-        #elif defined(__alpha__)
-            r.halfs_.low = a*b;
-            #ifdef __GNUC__
-                __asm__("umulh %1,%2,%0" : "=r" (r.halfs_.high)
-                    : "r" (a), "r" (b));
-            #elif defined(__DECCXX)
-                r.halfs_.high = asm("umulh %a0, %a1, %v0", a, b);
-            #else
-                #error unknown alpha compiler
-            #endif
-
         #elif defined(__ia64__)
             r.halfs_.low = a*b;
             __asm__("xmpy.hu %0=%1,%2" : "=f" (r.halfs_.high)

=== modified file 'include/my_global.h'
--- a/include/my_global.h	2012-11-15 16:48:08 +0000
+++ b/include/my_global.h	2012-11-21 17:05:35 +0000
@@ -409,12 +409,6 @@ extern "C" int madvise(void *addr, size_
 #define QUOTE_ARG(x)		#x	/* Quote argument (before cpp) */
 #define STRINGIFY_ARG(x) QUOTE_ARG(x)	/* Quote argument, after cpp */
 
-/* Paranoid settings. Define I_AM_PARANOID if you are paranoid */
-#ifdef I_AM_PARANOID
-#define DONT_ALLOW_USER_CHANGE 1
-#define DONT_USE_MYSQL_PWD 1
-#endif
-
 /* Does the system remember a signal handler after a signal ? */
 #if !defined(HAVE_BSD_SIGNALS) && !defined(HAVE_SIGACTION)
 #define SIGNAL_HANDLER_RESET_ON_DELIVERY

=== modified file 'include/my_nosys.h'
--- a/include/my_nosys.h	2011-09-07 10:08:09 +0000
+++ b/include/my_nosys.h	2012-11-21 17:05:35 +0000
@@ -39,11 +39,6 @@ extern size_t my_quick_read(File Filedes
                             myf myFlags);
 extern size_t my_quick_write(File Filedes,const uchar *Buffer,size_t Count);
 
-#if defined(USE_HALLOC)
-#define my_malloc(a,b) halloc(a,1)
-#define my_no_flags_free(a) hfree(a)
-#endif
-
 #endif /* __MY_NOSYS__ */
 
 #ifdef	__cplusplus

=== modified file 'include/my_stacktrace.h'
--- a/include/my_stacktrace.h	2012-03-28 18:48:25 +0000
+++ b/include/my_stacktrace.h	2012-11-21 17:05:35 +0000
@@ -19,8 +19,7 @@
 #include <my_global.h>
 
 #ifdef TARGET_OS_LINUX
-#if defined (__x86_64__) || defined (__i386__) || \
-    (defined(__alpha__) && defined(__GNUC__))
+#if defined (__x86_64__) || defined (__i386__)
 #define HAVE_STACKTRACE 1
 #endif
 #elif defined(__WIN__) || defined(HAVE_PRINTSTACK)

=== modified file 'include/my_sys.h'
--- a/include/my_sys.h	2012-11-19 14:55:39 +0000
+++ b/include/my_sys.h	2012-11-21 17:05:35 +0000
@@ -381,10 +381,6 @@ typedef struct st_io_cache_share
   int                   running_threads; /* threads not in lock. */
   int                   total_threads;   /* threads sharing the cache. */
   int                   error;           /* Last error. */
-#ifdef NOT_YET_IMPLEMENTED
-  /* whether the structure should be free'd */
-  my_bool alloced;
-#endif
 } IO_CACHE_SHARE;
 
 typedef struct st_io_cache		/* Used when cacheing files */

=== modified file 'libmysqld/libmysqld.c'
--- a/libmysqld/libmysqld.c	2012-03-28 18:48:25 +0000
+++ b/libmysqld/libmysqld.c	2012-11-21 17:05:35 +0000
@@ -130,10 +130,8 @@ mysql_real_connect(MYSQL *mysql,const ch
   if (!passwd)
   {
     passwd=mysql->options.password;
-#if !defined(DONT_USE_MYSQL_PWD)
     if (!passwd)
       passwd=getenv("MYSQL_PWD");		/* get it from environment */
-#endif
   }
   mysql->passwd= passwd ? my_strdup(passwd,MYF(0)) : NULL;
 #endif /*!NO_EMBEDDED_ACCESS_CHECKS*/

=== modified file 'mysys/my_lib.c'
--- a/mysys/my_lib.c	2012-03-28 18:48:25 +0000
+++ b/mysys/my_lib.c	2012-11-21 17:05:35 +0000
@@ -107,10 +107,6 @@ MY_DIR	*my_dir(const char *path, myf MyF
 #endif
 
   dirp = opendir(directory_file_name(tmp_path,(char *) path));
-#if defined(__amiga__)
-  if ((dirp->dd_fd) < 0)			/* Directory doesn't exists */
-    goto error;
-#endif
   if (dirp == NULL || 
       ! (buffer= my_malloc(ALIGN_SIZE(sizeof(MY_DIR)) + 
                            ALIGN_SIZE(sizeof(DYNAMIC_ARRAY)) +

=== modified file 'mysys/my_malloc.c'
--- a/mysys/my_malloc.c	2011-09-07 10:08:09 +0000
+++ b/mysys/my_malloc.c	2012-11-21 17:05:35 +0000
@@ -84,11 +84,7 @@ void *my_realloc(void *oldpoint, size_t
                   goto end;);
   if (!oldpoint && (my_flags & MY_ALLOW_ZERO_PTR))
     DBUG_RETURN(my_malloc(size, my_flags));
-#ifdef USE_HALLOC
-  point= malloc(size);
-#else
   point= realloc(oldpoint, size);
-#endif
 #ifndef DBUG_OFF
 end:
 #endif
@@ -104,13 +100,6 @@ end:
     DBUG_EXECUTE_IF("simulate_out_of_memory",
                     DBUG_SET("-d,simulate_out_of_memory"););
   }
-#ifdef USE_HALLOC
-  else
-  {
-    memcpy(point,oldpoint,size);
-    free(oldpoint);
-  }
-#endif
   DBUG_PRINT("exit",("ptr: %p", point));
   DBUG_RETURN(point);
 }

=== modified file 'mysys/stacktrace.c'
--- a/mysys/stacktrace.c	2012-11-06 14:16:49 +0000
+++ b/mysys/stacktrace.c	2012-11-21 17:05:35 +0000
@@ -249,53 +249,10 @@ void my_print_stacktrace(uchar* stack_bo
 #define SIGRETURN_FRAME_OFFSET 23
 #endif
 
-#if defined(__alpha__) && defined(__GNUC__)
-/*
-  The only way to backtrace without a symbol table on alpha
-  is to find stq fp,N(sp), and the first byte
-  of the instruction opcode will give us the value of N. From this
-  we can find where the old value of fp is stored
-*/
-
-#define MAX_INSTR_IN_FUNC  10000
-
-inline uchar** find_prev_fp(uint32* pc, uchar** fp)
-{
-  int i;
-  for (i = 0; i < MAX_INSTR_IN_FUNC; ++i,--pc)
-  {
-    uchar* p = (uchar*)pc;
-    if (p[2] == 222 &&  p[3] == 35)
-    {
-      return (uchar**)((uchar*)fp - *(short int*)p);
-    }
-  }
-  return 0;
-}
-
-inline uint32* find_prev_pc(uint32* pc, uchar** fp)
-{
-  int i;
-  for (i = 0; i < MAX_INSTR_IN_FUNC; ++i,--pc)
-  {
-    char* p = (char*)pc;
-    if (p[1] == 0 && p[2] == 94 &&  p[3] == -73)
-    {
-      uint32* prev_pc = (uint32*)*((fp+p[0]/sizeof(fp)));
-      return prev_pc;
-    }
-  }
-  return 0;
-}
-#endif /* defined(__alpha__) && defined(__GNUC__) */
-
 void my_print_stacktrace(uchar* stack_bottom, ulong thread_stack)
 {
   uchar** fp;
   uint frame_count = 0, sigreturn_frame_count;
-#if defined(__alpha__) && defined(__GNUC__)
-  uint32* pc;
-#endif
   LINT_INIT(fp);
 
 
@@ -309,11 +266,6 @@ void my_print_stacktrace(uchar* stack_bo
 		      :"=r"(fp)
 		      :"r"(fp));
 #endif
-#if defined(__alpha__) && defined(__GNUC__) 
-  __asm __volatile__ ("mov $30,%0"
-		      :"=r"(fp)
-		      :"r"(fp));
-#endif
   if (!fp)
   {
     my_safe_printf_stderr("%s",
@@ -342,17 +294,6 @@ void my_print_stacktrace(uchar* stack_bo
 
   my_safe_printf_stderr("%s",
     "Stack range sanity check OK, backtrace follows:\n");
-#if defined(__alpha__) && defined(__GNUC__)
-  my_safe_printf_stderr("%s",
-    "Warning: Alpha stacks are difficult -"
-    "will be taking some wild guesses, stack trace may be incorrect or "
-    "terminate abruptly\n");
-
-  /* On Alpha, we need to get pc */
-  __asm __volatile__ ("bsr %0, do_next; do_next: "
-		      :"=r"(pc)
-		      :"r"(pc));
-#endif  /* __alpha__ */
 
   /* We are 1 frame above signal frame with NPTL and 2 frames above with LT */
   sigreturn_frame_count = thd_lib_detected == THD_LIB_LT ? 2 : 1;
@@ -366,32 +307,6 @@ void my_print_stacktrace(uchar* stack_bo
                           *(fp + SIGRETURN_FRAME_OFFSET) : *(fp + 1));
 #endif /* defined(__386__)  || defined(__x86_64__) */
 
-#if defined(__alpha__) && defined(__GNUC__)
-    uchar** new_fp = find_prev_fp(pc, fp);
-    if (frame_count == sigreturn_frame_count - 1)
-    {
-      new_fp += 90;
-    }
-
-    if (fp && pc)
-    {
-      pc = find_prev_pc(pc, fp);
-      if (pc)
-	my_safe_printf_stderr("%p\n", pc);
-      else
-      {
-        my_safe_printf_stderr("%s",
-          "Not smart enough to deal with the rest of this stack\n");
-	goto end;
-      }
-    }
-    else
-    {
-      my_safe_printf_stderr("%s",
-        "Not smart enough to deal with the rest of this stack\n");
-      goto end;
-    }
-#endif /* defined(__alpha__) && defined(__GNUC__) */
     if (new_fp <= fp )
     {
       my_safe_printf_stderr("New value of fp=%p failed sanity check, "

=== modified file 'sql-common/client.c'
--- a/sql-common/client.c	2012-11-20 13:13:04 +0000
+++ b/sql-common/client.c	2012-11-21 17:05:35 +0000
@@ -3171,7 +3171,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,cons
   if (!passwd)
   {
     passwd=mysql->options.password;
-#if !defined(DONT_USE_MYSQL_PWD) && !defined(MYSQL_SERVER)
+#if !defined(MYSQL_SERVER)
     if (!passwd)
       passwd=getenv("MYSQL_PWD");		/* get it from environment */
 #endif

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2012-11-15 16:48:08 +0000
+++ b/sql/handler.cc	2012-11-21 17:05:35 +0000
@@ -1828,7 +1828,6 @@ int ha_recover(HASH *commit_list)
   if (info.commit_list)
     sql_print_information("Starting crash recovery...");
 
-#ifndef WILL_BE_DELETED_LATER
   /*
     for now, only InnoDB supports 2pc. It means we can always safely
     rollback all pending transactions, without risking inconsistent data
@@ -1836,7 +1835,6 @@ int ha_recover(HASH *commit_list)
   DBUG_ASSERT(total_ha_2pc == (ulong) opt_bin_log+1); // only InnoDB and binlog
   tc_heuristic_recover= TC_HEURISTIC_RECOVER_ROLLBACK; // forcing ROLLBACK
   info.dry_run=FALSE;
-#endif
 
   for (info.len= MAX_XID_LIST_SIZE ; 
        info.list==0 && info.len > MIN_XID_LIST_SIZE; info.len/=2)

=== modified file 'sql/item.cc'
--- a/sql/item.cc	2012-11-20 08:18:51 +0000
+++ b/sql/item.cc	2012-11-21 17:05:35 +0000
@@ -827,14 +827,6 @@ Item_ident::Item_ident(THD *thd, Item_id
 void Item_ident::cleanup()
 {
   DBUG_ENTER("Item_ident::cleanup");
-#ifdef CANT_BE_USED_AS_MEMORY_IS_FREED
-		       db_name ? db_name : "(null)",
-                       orig_db_name ? orig_db_name : "(null)",
-		       table_name ? table_name : "(null)",
-                       orig_table_name ? orig_table_name : "(null)",
-		       field_name ? field_name : "(null)",
-                       orig_field_name ? orig_field_name : "(null)"));
-#endif
   Item::cleanup();
   db_name= orig_db_name; 
   table_name= orig_table_name;

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-11-14 12:33:20 +0000
+++ b/sql/mysqld.cc	2012-11-21 17:05:35 +0000
@@ -2908,11 +2908,7 @@ void my_init_signals(void)
 #ifdef HAVE_STACKTRACE
     my_init_stacktrace();
 #endif
-#if defined(__amiga__)
-    sa.sa_handler=(void(*)())handle_fatal_signal;
-#else
     sa.sa_handler=handle_fatal_signal;
-#endif
     sigaction(SIGSEGV, &sa, NULL);
     sigaction(SIGABRT, &sa, NULL);
 #ifdef SIGBUS

=== modified file 'sql/sql_acl.cc'
--- a/sql/sql_acl.cc	2012-11-19 17:52:50 +0000
+++ b/sql/sql_acl.cc	2012-11-21 17:05:35 +0000
@@ -1213,7 +1213,6 @@ static my_bool acl_load(THD *thd, TABLE_
       else
       {
         user.ssl_type=SSL_TYPE_NONE;
-#ifndef TO_BE_REMOVED
         if (table->s->fields <= 13)
         {						// Without grant
           if (user.access & CREATE_ACL)
@@ -1225,7 +1224,6 @@ static my_bool acl_load(THD *thd, TABLE_
           user.access|= REPL_CLIENT_ACL | REPL_SLAVE_ACL;
         if (user.access & PROCESS_ACL)
           user.access|= SUPER_ACL | EXECUTE_ACL;
-#endif
       }
       (void) push_dynamic(&acl_users,(uchar*) &user);
       if (user.host.check_allow_all_hosts())
@@ -1334,13 +1332,11 @@ static my_bool acl_load(THD *thd, TABLE_
       }
     }
     db.sort=get_sort(3,db.host.get_host(),db.db,db.user);
-#ifndef TO_BE_REMOVED
     if (table->s->fields <=  9)
     {						// Without grant
       if (db.access & CREATE_ACL)
 	db.access|=REFERENCES_ACL | INDEX_ACL | ALTER_ACL;
     }
-#endif
     (void) push_dynamic(&acl_dbs,(uchar*) &db);
   } // END reading records from mysql.db tables
   

=== modified file 'sql/sql_tmp_table.cc'
--- a/sql/sql_tmp_table.cc	2012-10-30 08:00:36 +0000
+++ b/sql/sql_tmp_table.cc	2012-11-21 17:05:35 +0000
@@ -1972,17 +1972,8 @@ bool create_myisam_from_heap(THD *thd, T
     new_table.no_rows=1;
   }
 
-#ifdef TO_BE_DONE_LATER_IN_4_1
-  /*
-    To use start_bulk_insert() (which is new in 4.1) we need to find
-    all places where a corresponding end_bulk_insert() should be put.
-  */
-  table->file->info(HA_STATUS_VARIABLE); /* update table->file->stats.records */
-  new_table.file->ha_start_bulk_insert(table->file->stats.records);
-#else
   /* HA_EXTRA_WRITE_CACHE can stay until close, no need to disable it */
   new_table.file->extra(HA_EXTRA_WRITE_CACHE);
-#endif
 
   /*
     copy all old rows from heap table to MyISAM table

=== modified file 'storage/federated/ha_federated.cc'
--- a/storage/federated/ha_federated.cc	2012-11-06 14:16:49 +0000
+++ b/storage/federated/ha_federated.cc	2012-11-21 17:05:35 +0000
@@ -622,11 +622,7 @@ int get_connection(MEM_ROOT *mem_root, F
   share->username= server->username;
   share->password= server->password;
   share->database= server->db;
-#ifndef I_AM_PARANOID
-  share->port= server->port > 0 && server->port < 65536 ? 
-#else
-  share->port= server->port > 1023 && server->port < 65536 ? 
-#endif
+  share->port= server->port > 0 && server->port < 65536 ?
                (ushort) server->port : MYSQL_PORT;
   share->hostname= server->host;
   if (!(share->socket= server->socket) &&

=== modified file 'tests/mysql_client_fw.c'
--- a/tests/mysql_client_fw.c	2012-10-10 12:21:38 +0000
+++ b/tests/mysql_client_fw.c	2012-11-21 17:05:35 +0000
@@ -1213,10 +1213,8 @@ static struct my_option client_test_long
 {"testcase", 'c',
  "May disable some code when runs as mysql-test-run testcase.",
  0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
-#ifndef DONT_ALLOW_USER_CHANGE
 {"user", 'u', "User for login if not current user", &opt_user,
  &opt_user, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
 {"vardir", 'v', "Data dir for tests.", &opt_vardir,
  &opt_vardir, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 {"getopt-ll-test", 'g', "Option for testing bug in getopt library",

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (jon.hauglid:5059 to 5060) Bug#15878828Jon Olav Hauglid21 Nov