1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update mysql-test results after merge

Browse Source 
include/my_sys.h:
  Portability fix
include/sslopt-longopts.h:
  Better help for --ssl
mysql-test/r/binary.result:
  Update results after merge
mysys/my_malloc.c:
  Portability fix
sql/udf_example.cc:
  Use longlong instead of 'long long' to make things works on windows
This commit is contained in:
unknown 2002-09-18 02:21:29 +03:00
parent 081023e8fd
commit aef675029f
5 changed files with 44 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/my_sys.h
View File

@ -153,8 +153,8 @@ extern gptr my_malloc(uint Size,myf MyFlags);
extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags); extern gptr my_realloc(gptr oldpoint,uint Size,myf MyFlags);
extern void my_no_flags_free(gptr ptr); extern void my_no_flags_free(gptr ptr);
extern gptr my_memdup(const byte *from,uint length,myf MyFlags); extern gptr my_memdup(const byte *from,uint length,myf MyFlags);
extern my_string my_strdup(const char *from,myf MyFlags); extern char *my_strdup(const char *from,myf MyFlags);
extern my_string my_strdup_with_length(const char *from,uint length, extern char *my_strdup_with_length(const byte *from, uint length,
myf MyFlags); myf MyFlags);
#define my_free(PTR,FG) my_no_flags_free(PTR) #define my_free(PTR,FG) my_no_flags_free(PTR)
#define CALLER_INFO_PROTO /* nothing */ #define CALLER_INFO_PROTO /* nothing */

2
include/sslopt-longopts.h
View File

@ -17,7 +17,7 @@
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
{"ssl", OPT_SSL_SSL, {"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, (gptr*) &opt_use_ssl, (gptr*) &opt_use_ssl, 0, GET_BOOL, NO_ARG, 0, 0, 0,
0, 0, 0}, 0, 0, 0},
{"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl)", {"ssl-key", OPT_SSL_KEY, "X509 key in PEM format (implies --ssl)",

10
mysql-test/r/binary.result
View File

@ -54,3 +54,13 @@ select * from t1 where b="hello";
a b a b
hello hello hello hello
drop table t1; 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;

8
mysys/my_malloc.c
View File

@ -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; gptr ptr;
uint length=(uint) strlen(from)+1; 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; gptr ptr;
if ((ptr=my_malloc(length+1,MyFlags)) != 0) if ((ptr=my_malloc(length+1,MyFlags)) != 0)
{ {
memcpy((byte*) ptr, (byte*) from,(size_t) length); memcpy((byte*) ptr, (byte*) from,(size_t) length);
ptr[length]=0; ((char*) ptr)[length]=0;
} }
return(ptr); return((char*) ptr);
} }

11
sql/udf_example.cc
View File

@ -1,4 +1,4 @@
/* 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 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 it under the terms of the GNU General Public License as published by
@ -111,6 +111,13 @@
#ifdef STANDARD #ifdef STANDARD
#include <stdio.h> #include <stdio.h>
#include <string.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 #else
#include <my_global.h> #include <my_global.h>
#include <my_sys.h> #include <my_sys.h>
@ -795,7 +802,7 @@ char *reverse_lookup(UDF_INIT *initid, UDF_ARGS *args, char *result,
struct avgcost_data struct avgcost_data
{ {
unsigned long long count; ulonglong count;
longlong totalquantity; longlong totalquantity;
double totalprice; double totalprice;
}; };