summaryrefslogtreecommitdiff
path: root/VC++Files
Commit message (Expand)AuthorAgeFilesLines
* Merging conflicts resolvedhf@deer.(none)2005-01-111-1/+1
|\
| * Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-01-111-2/+2
| |\
| | * - Create the mysqld binaries with the correct file names during the buildlenz@mysql.com2005-01-111-2/+2
| * | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2005-01-111-1/+1
| |\ \ | | |/ | |/|
| | * Fix for bug #6434 (bad memory deletion in app using libmysqld)hf@deer.(none)2005-01-031-1/+1
* | | mergedserg@sergbook.mysql.com2005-01-063-16/+16
|\ \ \ | |/ /
| * | mysql_test_run_new.dsp:kent@mysql.com2005-01-043-16/+16
| |/
* | prepare, winmysqladmin.cpp, mysqldmax.dsp, mysqld.dsp, mysql.dsw:kent@mysql.com2005-01-015-122/+20
* | Merge with global treemonty@mysql.com2004-12-314-60/+138
|\ \
| * \ Merge with 4.1monty@mishka.local2004-12-224-60/+138
| |\ \ | | |/
| | * corrected mysqltest.dspwax@kishkin.ru2004-12-143-36/+51
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1rburnett@build.mysql.com2004-12-061-24/+87
| | |\
| | | * Bug #6697 Failure to build 4.1.7 on Visual Studio .NET [fixed]rburnett@build.mysql.com2004-12-021-24/+87
* | | | VC++Files/mysqlmanager deletedpetr@mysql.com2004-12-2941-4449/+0
|/ / /
* | | Changing the default of libmysqlclient : it's now NO reconnection.guilhem@mysql.com2004-12-094-0/+9
* | | Merge with 4.1monty@mysql.com2004-12-063-0/+255
|\ \ \ | |/ /
| * | added project files of mysqltest and mysql_test_run_newwax@kishkin.ru2004-12-033-0/+255
| |/
* | mergedserg@serg.mylan2004-11-221-1/+1
|\ \ | |/
| * - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows buildslenz@mysql.com2004-11-221-1/+1
* | - added sql_trigger.cpp to the mysqld and libmysqld project fileslenz@mysql.com2004-11-182-0/+8
* | merge with 4.1monty@mysql.com2004-10-292-0/+8
|\ \ | |/
| * - added missing file strings/my_strtoll10.c to the libmysql.dsp andlenz@mysql.com2004-10-142-0/+8
* | Merge with 4.1monty@mysql.com2004-09-063-19/+117
|\ \ | |/
| * Adding the file needed for windows build (on behalf of Reggie)sergefp@mysql.com2004-08-271-0/+8
| * mergedserg@serg.mylan2004-08-261-0/+83
| |\
| | * mysql_priv.h:rburnett@build.mysql.com2004-08-141-0/+83
| * | mysql_com.h:guilhem@mysql.com2004-08-191-11/+7
| * | mysql_com.h:guilhem@mysql.com2004-08-191-9/+9
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-08-191-16/+27
| |\ \
| | * | Very small API change: changing the values in enum enum_shutdown_level;guilhem@mysql.com2004-08-191-16/+27
| * | | manually mergedserg@serg.mylan2004-08-181-2/+2
| |\ \ \ | | |/ / | |/| / | | |/
| | * - Windows compile fix: added srv/srv0que.c to the innobase projectlenz@mysql.com2004-08-051-0/+4
| | * - make sure the Windows "-classic" server binaries actually includelenz@mysql.com2004-07-301-2/+2
| | * Development.fgl:patg@krsna.patg.net2004-06-233-23/+25
* | | Post-merge fix.pem@mysql.com2004-07-231-16/+8
|\ \ \ | |/ /
| * | First step of implementation of WL#1518 "make bundled zlibkonstantin@mysql.com2004-07-211-16/+8
* | | - Added sql/parse_file.cpp and sql/sql_view.cpp to the mysqld andlenz@mysql.com2004-07-162-5/+21
* | | Merge with 4.1.3-betamonty@mysql.com2004-07-0785-8308/+271
|\ \ \ | |/ /
| * | Added missing my_time.c file to mysqlclient projectmonty@mysql.com2004-06-281-0/+4
| * | - removed the VC++Files/InstallShield directory per Montys requestlenz@mysql.com2004-06-25142-16165/+0
| * | Many files:patg@krsna.patg.net2004-06-2568-0/+7790
| * | Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2004-06-243-0/+12
| |\ \
| | * | - Windows compile fix: added missing file tztime.cpp to the mysqldlenz@mysql.com2004-06-241-0/+4
| | * | - Windows compile fix: added srv/srv0que.c to the innobase projectlenz@mysql.com2004-06-242-0/+8
| * | | Fix for Bug#4030 "Client side conversion string -> date type doesn't konstantin@mysql.com2004-06-243-0/+12
| |/ /
| * | Including in enum_shutdown_level the 2 types of KILL of 5.0guilhem@mysql.com2004-06-211-1/+5
| * | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1guilhem@mysql.com2004-06-211-5/+6
| |\ \
| | * | changing order of enum_shutdown_level (easier; we can test if we should die withguilhem@mysql.com2004-06-211-5/+6
| * | | mergemonty@mysql.com2004-06-214-77/+158
| |\ \ \ | | |/ / | |/| |
| | * | Merge with 4.0.21monty@mysql.com2004-06-184-77/+158
| | |\ \ | | | |/