database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-5.1-new

Browse Source 
into mysql.com:/home/hf/work/mysql-5.1.18518
This commit is contained in:
holyfoot@mysql.com
2006-05-02 14:36:05 +05:00
parent 05f32a3db0 b050f975c4
commit 128593f0c2
171 changed files with 11796 additions and 1688 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/config-win.h
View File

@@ -382,6 +382,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

@@ -545,7 +545,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