mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 12:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into  april.(none):/home/svoj/devel/mysql/BUG17810/mysql-5.0
This commit is contained in:
svoj@april.(none) 2006-05-03 16:37:42 +05:00
commit 365e38b05c
189 changed files with 12633 additions and 1626 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/config-win.h
View file

@ -367,6 +367,7 @@ inline double ulonglong2double(ulonglong value)
#include <custom_conf.h>
#else
#define DEFAULT_MYSQL_HOME "c:\\mysql"
#define DATADIR "c:\\mysql\\data"
#define PACKAGE "mysql"
#define DEFAULT_BASEDIR "C:\\"
#define SHAREDIR "share"

2
include/my_global.h
View file

@ -464,7 +464,7 @@ typedef unsigned short ushort;
/*
Wen using the embedded library, users might run into link problems,
dupicate declaration of __cxa_pure_virtual, solved by declaring it a
duplicate declaration of __cxa_pure_virtual, solved by declaring it a
weak symbol.
*/
#ifdef USE_MYSYS_NEW

5
include/my_sys.h
View file

@ -599,6 +599,11 @@ extern char *_my_strdup_with_length(const byte *from, uint length,
const char *sFile, uint uLine,
myf MyFlag);
/* implemented in my_memmem.c */
extern void *my_memmem(const void *haystack, size_t haystacklen,
const void *needle, size_t needlelen);
#ifdef __WIN__
extern int my_access(const char *path, int amode);
extern File my_sopen(const char *path, int oflag, int shflag, int pmode);

1
include/mysql.h
View file

@ -409,6 +409,7 @@ MYSQL * STDCALL mysql_init(MYSQL *mysql);
my_bool STDCALL mysql_ssl_set(MYSQL *mysql, const char *key,
const char *cert, const char *ca,
const char *capath, const char *cipher);
const char * STDCALL mysql_get_ssl_cipher(MYSQL *mysql);
my_bool STDCALL mysql_change_user(MYSQL *mysql, const char *user,
const char *passwd, const char *db);
MYSQL * STDCALL mysql_real_connect(MYSQL *mysql, const char *host,