database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-21 06:21:35 +03:00
Code Activity
29,990 Commits 3,280 Branches 1,098 Tags
dadc0ffc22775810cdb1718cb50bf11c4916e4fe
Commit Graph

289 Commits

Author SHA1 Message Date
ndbdev@dl145b.mysql.com
583979d949 merge 2005-08-31 20:45:48 +02:00
SergeyV@selena.
3fdd500288 Fixes bug #11815. Convert file path to UNIX format to build correct query 
string while replicating LOAD DATA INFILE statement.
 2005-08-30 22:19:15 +04:00
reggie@linux.site
6bf4e15b08 updated some vcproj files and the .sln file 2005-08-29 15:35:27 -06:00
kent@mysql.com
64c2d24978 libmysqld.vcproj: 
Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
  Aligned engines with Unix version
sql_class.cc:
  VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
  Can't assume macro set_timespec_nsec exists if set_timespec does
 2005-08-25 23:24:43 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
 2005-08-25 13:11:38 -04:00
monty@mishka.local
f384e08277 Merge mishka.local:/home/my/mysql-4.1 
into  mishka.local:/home/my/mysql-5.0
 2005-08-25 06:55:48 +03:00
joerg@mysql.com
c070251abd Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1 2005-08-24 13:56:54 +02:00
kent@mysql.com
7933906325 mysqld.dsp: 
Added archive and example storage engine to Windows build
ha_example.cc, ha_archive.cc:
  Windows fix, use relative include path to "mysql_priv.h"
ha_archive.h:
  Windows VC6 compile needed (char*) cast of byte var
mysqltest.dsp, mysql_test_run_new.dsp:
  Added /FD flag, to avoid include file warnings
 2005-08-18 17:29:24 +02:00
reggie@monster.
03060be40f Some changes to project files 
str_alloc had been added but was not added to mysqlclient and strings
libmysql should have had strings as a dependent.
 2005-08-09 14:48:43 -05:00
kent@mysql.com
d17a4773b4 mysqld.dsp: 
Added the blackhole storage engine to the Max builds
 2005-08-04 13:47:02 +02:00
jimw@mysql.com
97797d91fb Merge mysql.com:/home/jimw/my/mysql-5.0-7003 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-08-02 16:50:09 -07:00
reggie@fedora.(none)
5a0250c349 Conversions of dsp files to vcproj. These files are compatible with 
Visual Studio 2003.  I have not yet changed the windows build scripts
to use these.
 2005-08-02 18:47:02 -05:00
igor@rurik.mysql.com
f4c1b3bae4 Merge 2005-07-31 02:44:18 -07:00
lenz@mysql.com
c36a0fa5ac - fixed a typo in C++Files/client/mysqlclient_ia64.dsp: ctype-cp963.c -> ctype-cp932.c 
(thanks to JoergB for spotting it)
 2005-07-29 12:37:27 +02:00
joerg@mysql.com
3d9bae7b54 File / directory structure change from 5.0 to 5.1: 
Table handlers "bdb" and "myisam" (and others) have been moved into a common subdirectory "storage".

Include paths between main projects and table handler files need to be adapted.
 2005-07-22 18:45:31 +02:00
hf@deer.(none)
d72a837029 Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-07-22 12:18:19 +05:00
hf@deer.(none)
62aad2bcd0 merging 2005-07-22 12:15:09 +05:00
jimw@mysql.com
6c18c133a2 Add new files to Windows bdb project file 2005-07-21 18:26:42 -07:00
joerg@mysql.com
16bfcd3c75 File / directory structure change from 5.0 to 5.1: 
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".

This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.
 2005-07-21 21:47:46 +02:00
hf@deer.(none)
ea81d5eaa3 Fix for bug #12042 (User breakpoints calling free() in embedded library) 2005-07-21 17:17:46 +05:00
monty@mishka.local
2278e0319c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mishka.local:/home/my/mysql-5.0
 2005-07-18 19:03:01 +03:00
monty@mishka.local
78c65b5adc Cleanups during review 
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
 2005-07-18 15:33:18 +03:00
kent@mysql.com
aab8220342 Merge 2005-07-13 02:39:23 +02:00
kent@mysql.com
601e872848 Merge 2005-07-08 15:52:15 +02:00
kent@mysql.com
f65323bd08 mysql_client_test.dsp: 
Corrected libs and lib search path for debug target
 2005-07-08 15:36:57 +02:00
jimw@mysql.com
f5f434cf9f Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-06 19:05:36 -07:00
jimw@mysql.com
f1ac600a7e Merge jwinstead@production.mysql.com:my/mysql-5.0-11045 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-06 16:49:04 -07:00
kent@mysql.com
21876e0ada Merge 2005-07-06 16:42:16 +02:00
kent@mysql.com
8b2ee5b11e mysql-test-run.pl: 
Handle case where SHELL isn't set in Cygwin
mysql_client_test.dsp:
  Put output into the "client_debug" and "client_release" directories
 2005-07-06 16:17:32 +02:00
kent@mysql.com
fab90ce856 mysqld.dsp: 
Corrected quoting of string "pro-nt"
 2005-06-28 04:37:01 +02:00
jimw@mysql.com
409592e652 Add my_str_malloc and _free function pointers to strings library 
which will by default exit(1) if malloc() fails, but can be set
to do something else by the calling program does, which mysqld
does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks
allocation in conf_to_src utility program. (Bug #7003)
 2005-06-24 13:41:33 -07:00
jimw@mysql.com
99e35c84ac Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-20 15:02:45 -07:00
jimw@mysql.com
7e70aee169 Fix another .dsp trying to link debug binary against release version of yassl 2005-06-18 02:03:49 +02:00
jimw@mysql.com
f2b0874f80 Clean up warnings and build problems on Windows. (Bug #11045) 2005-06-18 01:55:42 +02:00
kent@mysql.com
155c322c59 mysqld.dsp: 
Corrected typo
 2005-06-10 04:09:42 +02:00
kent@mysql.com
b949adc289 2005-06-09 18:02:07 +02:00
kent@mysql.com
2c6616e3ff Many files: 
More yaSSL changes in Visual Studio 6 project files
 2005-06-09 16:53:08 +02:00
kent@mysql.com
4d0a81aa8b config-win.h: 
Enabled yaSSL on Windows
Many files:
  Added yaSSL to Visual Studio 6 project files
 2005-06-09 05:04:59 +02:00
kent@mysql.com
0005165fa0 mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp: 
Added /FD flag, to avoid include file warnings
mysqlclient.dsp:
  Removed duplicate entry for "strings/ctype-cp932.c"
  Added missing "mysys/my_access.c"
libmysqld.dsp:
  Added missing "mysys/charset.c"
libmysqld.def:
  Added symbol 'get_charset_name'
 2005-06-09 00:49:37 +02:00
jimw@mysql.com
6b1a9f64bb Fix Windows build warning and file missing from projects. 2005-06-08 01:25:06 +02:00
lenz@mysql.com
13afa9129b Some Windows compile improvements: 
- removed some unreferenced variables
 - fixed the libmysql project file by removing a duplicate file reference (merge error)
 2005-06-06 15:23:04 +02:00
schwenke@lmy003.xl.local
7d6b47c994 misc. fixes for windoze builds 2005-06-02 15:32:02 +02:00
lenz@mysql.com
9afd2563e9 Merge of 4.1 -> 5.0 2005-06-01 15:11:14 +02:00
lenz@mysql.com
c58535f6d3 - merged the 4.1.12a Changes back into the main tree 2005-05-26 11:43:47 +02:00
monty@mysql.com
dac499ce7c Merge hasky:/my/mysql-build into mysql.com:/home/my/mysql-5.0 2005-05-25 19:55:01 +03:00
lenz@mysql.com
89e4e756c8 - one more build fix for zlib.lib - added libpath to the 
mysql_test_run_new project files
 2005-05-25 10:55:21 +02:00
lenz@mysql.com
6083014c4c - applied more changes to enable the CP932 charset on Windows 
- fixed linking with zlib
 2005-05-24 22:42:43 +02:00
kent@mysql.com
bedc2e3d4c ha_archive.cc: 
Use local seach path for "mysql_priv.h"
mysqld.dsp:
  Added the ARCHIVE storage engine to max
ha_archive.h:
  VC6, but not VC7, needs a cast of byte[] to char* to make
  the compile select the right conversion function in String
 2005-05-24 18:51:53 +02:00
lenz@mysql.com
236ca3626f - added the cp932 charset support to the Windows builds 2005-05-24 14:46:28 +02:00
gluh@mysql.com
ce5d59d380 Merge gluh@gluh:/home/gluh/release/mysql-5.0-build 
into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0
 2005-05-24 15:35:24 +05:00