Commit dfd0f82b authored by monty@mashka.mysql.fi's avatar monty@mashka.mysql.fi
Browse files

Update mysql-test results after merge

parent 70b1d538

include/my_sys.h

+3 −3
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ extern gptr my_malloc(uint Size,myf MyFlags); 
extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags);

extern void my_no_flags_free(gptr ptr);

extern gptr my_memdup(const byte *from,uint length,myf MyFlags);

extern my_string my_strdup(const char *from,myf MyFlags);

extern my_string my_strdup_with_length(const char *from,uint length,

extern char *my_strdup(const char *from,myf MyFlags);

extern char *my_strdup_with_length(const byte *from, uint length,

				   myf MyFlags);

#define my_free(PTR,FG) my_no_flags_free(PTR)

#define CALLER_INFO_PROTO   /* nothing */

include/sslopt-longopts.h

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#ifdef HAVE_OPENSSL



  {"ssl", OPT_SSL_SSL,

   "Use SSL for connection (automatically set with other flags)",

   "Enable SSL for connection (automatically enabled with other flags). Disable with --skip-ssl",

 (gptr*) &opt_use_ssl, (gptr*) &opt_use_ssl, 0, GET_BOOL, NO_ARG, 0, 0, 0,

   0, 0, 0},

  {"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl)",

mysql-test/r/binary.result

+10 −0
Original line number Diff line number Diff line
@@ -54,3 +54,13 @@ select * from t1 where b="hello"; 
a	b

hello	hello

drop table t1;

create table t1 (b char(8));

insert into t1 values(NULL);

select b from t1 where binary b like '';

b

select b from t1 group by binary b like '';

b

NULL

select b from t1 having binary b like '';

b

drop table t1;

mysys/my_malloc.c

+4 −4
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ gptr my_memdup(const byte *from, uint length, myf MyFlags) 
}





my_string my_strdup(const char *from, myf MyFlags)

char *my_strdup(const char *from, myf MyFlags)

{

  gptr ptr;

  uint length=(uint) strlen(from)+1;
@@ -83,13 +83,13 @@ my_string my_strdup(const char *from, myf MyFlags) 
}





gptr my_strdup_with_length(const byte *from, uint length, myf MyFlags)

char *my_strdup_with_length(const byte *from, uint length, myf MyFlags)

{

  gptr ptr;

  if ((ptr=my_malloc(length+1,MyFlags)) != 0)

  {

    memcpy((byte*) ptr, (byte*) from,(size_t) length);

    ptr[length]=0;

    ((char*) ptr)[length]=0;

  }

  return(ptr);

  return((char*) ptr);

}

sql/udf_example.cc

+25 −18
Original line number Diff line number Diff line 
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB

/* Copyright (C) 2002 MySQL AB



   This program is free software; you can redistribute it and/or modify

   it under the terms of the GNU General Public License as published by
@@ -111,6 +111,13 @@ 
#ifdef STANDARD

#include <stdio.h>

#include <string.h>

#ifdef __WIN__

typedef unsigned __int64 ulonglong;	/* Microsofts 64 bit types */

typedef __int64 longlong;

#else

typedef unsigned long long ulonglong;

typedef long long longlong;

#endif /*__WIN__*/

#else

#include <my_global.h>

#include <my_sys.h>
@@ -795,7 +802,7 @@ char *reverse_lookup(UDF_INIT *initid, UDF_ARGS *args, char *result, 


struct avgcost_data

{

  unsigned long long count;

  ulonglong	count;

  longlong	totalquantity;

  double	totalprice;

};