Commit 3afb157c authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fixes up things after merge from 3.23.44 

Portability fixes.
Don't delete temporary tables on FLUSH tables.
parent 5609e21d

client/client_priv.h

+2 −1
Original line number Diff line number Diff line
@@ -30,4 +30,5 @@ enum options { OPT_CHARSETS_DIR=256, OPT_DEFAULT_CHARSET, 
	       OPT_PAGER, OPT_NOPAGER, OPT_TEE, OPT_NOTEE,

	       OPT_LOW_PRIORITY, OPT_AUTO_REPAIR, OPT_COMPRESS,

	       OPT_DROP, OPT_LOCKS, OPT_KEYWORDS, OPT_DELAYED, OPT_OPTIMIZE,

	       OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES};
 
	       OPT_FTB, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC, OPT_TABLES,

	       OPT_MASTER_DATA, OPT_AUTOCOMMIT};

client/mysqldump.c

+0 −5
Original line number Diff line number Diff line
@@ -84,11 +84,6 @@ static DYNAMIC_STRING extended_row; 
#include "sslopt-vars.h"

FILE  *md_result_file;



enum md_options {OPT_FTB=256, OPT_LTB, OPT_ENC, OPT_O_ENC, OPT_ESC,

		 OPT_KEYWORDS, OPT_LOCKS, OPT_DROP, OPT_OPTIMIZE, OPT_DELAYED,

		 OPT_TABLES, MD_OPT_CHARSETS_DIR, MD_OPT_DEFAULT_CHARSET,

		 OPT_AUTOCOMMIT, OPT_MASTER_DATA};



static struct option long_options[] =

{

  {"all-databases",     no_argument,    0,      'A'},

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ typedef unsigned int uint; 
typedef unsigned short ushort;

#endif



#define CMP(a,b)        (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1)

#define CMP_NUM(a,b)    (((a) < (b)) ? -1 : ((a) == (b)) ? 0 : 1)

#define sgn(a)		(((a) < 0) ? -1 : ((a) > 0) ? 1 : 0)

#define swap(t,a,b)	{ register t dummy; dummy = a; a = b; b = dummy; }

#define test(a)		((a) ? 1 : 0)

include/violite.h

+2 −0
Original line number Diff line number Diff line
@@ -102,6 +102,8 @@ my_bool vio_peer_addr(Vio* vio, char *buf); 


void vio_in_addr(Vio *vio, struct in_addr *in);



my_bool vio_poll_read(Vio *vio,uint timeout);



#ifdef	__cplusplus

}

#endif

myisam/ft_boolean_search.c

+3 −3
Original line number Diff line number Diff line
@@ -87,9 +87,9 @@ typedef struct st_ft_info { 
int FTB_WORD_cmp(void *v, byte *a, byte *b)

{

  /* ORDER BY docid, ndepth DESC */

  int i=CMP(((FTB_WORD *)a)->docid, ((FTB_WORD *)b)->docid);

  int i=CMP_NUM(((FTB_WORD *)a)->docid, ((FTB_WORD *)b)->docid);

  if (!i)

    i=CMP(((FTB_WORD *)b)->ndepth,((FTB_WORD *)a)->ndepth);

    i=CMP_NUM(((FTB_WORD *)b)->ndepth,((FTB_WORD *)a)->ndepth);

  return i;

}
@@ -182,7 +182,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query, 


  if (!(ftb=(FTB *)my_malloc(sizeof(FTB), MYF(MY_WME))))

    return 0;

  ftb->please=& _ft_vft_boolean;

  ftb->please= (struct _ft_vft *) & _ft_vft_boolean;

  ftb->ok=1;

  ftb->info=info;

  ftb->keynr=keynr;