Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merging conflicts resolved | hf@deer.(none) | 2005-01-11 | 1 | -1/+1 |
|\ | |||||
| * | Merge mysql.com:/space/my/mysql-4.1 | lenz@mysql.com | 2005-01-11 | 1 | -2/+2 |
| |\ | |||||
| | * | - Create the mysqld binaries with the correct file names during the build | lenz@mysql.com | 2005-01-11 | 1 | -2/+2 |
| * | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 | hf@deer.(none) | 2005-01-11 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix for bug #6434 (bad memory deletion in app using libmysqld) | hf@deer.(none) | 2005-01-03 | 1 | -1/+1 |
* | | | merged | serg@sergbook.mysql.com | 2005-01-06 | 3 | -16/+16 |
|\ \ \ | |/ / | |||||
| * | | mysql_test_run_new.dsp: | kent@mysql.com | 2005-01-04 | 3 | -16/+16 |
| |/ | |||||
* | | prepare, winmysqladmin.cpp, mysqldmax.dsp, mysqld.dsp, mysql.dsw: | kent@mysql.com | 2005-01-01 | 5 | -122/+20 |
* | | Merge with global tree | monty@mysql.com | 2004-12-31 | 4 | -60/+138 |
|\ \ | |||||
| * \ | Merge with 4.1 | monty@mishka.local | 2004-12-22 | 4 | -60/+138 |
| |\ \ | | |/ | |||||
| | * | corrected mysqltest.dsp | wax@kishkin.ru | 2004-12-14 | 3 | -36/+51 |
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | rburnett@build.mysql.com | 2004-12-06 | 1 | -24/+87 |
| | |\ | |||||
| | | * | Bug #6697 Failure to build 4.1.7 on Visual Studio .NET [fixed] | rburnett@build.mysql.com | 2004-12-02 | 1 | -24/+87 |
* | | | | VC++Files/mysqlmanager deleted | petr@mysql.com | 2004-12-29 | 41 | -4449/+0 |
|/ / / | |||||
* | | | Changing the default of libmysqlclient : it's now NO reconnection. | guilhem@mysql.com | 2004-12-09 | 4 | -0/+9 |
* | | | Merge with 4.1 | monty@mysql.com | 2004-12-06 | 3 | -0/+255 |
|\ \ \ | |/ / | |||||
| * | | added project files of mysqltest and mysql_test_run_new | wax@kishkin.ru | 2004-12-03 | 3 | -0/+255 |
| |/ | |||||
* | | merged | serg@serg.mylan | 2004-11-22 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows builds | lenz@mysql.com | 2004-11-22 | 1 | -1/+1 |
* | | - added sql_trigger.cpp to the mysqld and libmysqld project files | lenz@mysql.com | 2004-11-18 | 2 | -0/+8 |
* | | merge with 4.1 | monty@mysql.com | 2004-10-29 | 2 | -0/+8 |
|\ \ | |/ | |||||
| * | - added missing file strings/my_strtoll10.c to the libmysql.dsp and | lenz@mysql.com | 2004-10-14 | 2 | -0/+8 |
* | | Merge with 4.1 | monty@mysql.com | 2004-09-06 | 3 | -19/+117 |
|\ \ | |/ | |||||
| * | Adding the file needed for windows build (on behalf of Reggie) | sergefp@mysql.com | 2004-08-27 | 1 | -0/+8 |
| * | merged | serg@serg.mylan | 2004-08-26 | 1 | -0/+83 |
| |\ | |||||
| | * | mysql_priv.h: | rburnett@build.mysql.com | 2004-08-14 | 1 | -0/+83 |
| * | | mysql_com.h: | guilhem@mysql.com | 2004-08-19 | 1 | -11/+7 |
| * | | mysql_com.h: | guilhem@mysql.com | 2004-08-19 | 1 | -9/+9 |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ | serg@serg.mylan | 2004-08-19 | 1 | -16/+27 |
| |\ \ | |||||
| | * | | Very small API change: changing the values in enum enum_shutdown_level; | guilhem@mysql.com | 2004-08-19 | 1 | -16/+27 |
| * | | | manually merged | serg@serg.mylan | 2004-08-18 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | - Windows compile fix: added srv/srv0que.c to the innobase project | lenz@mysql.com | 2004-08-05 | 1 | -0/+4 |
| | * | - make sure the Windows "-classic" server binaries actually include | lenz@mysql.com | 2004-07-30 | 1 | -2/+2 |
| | * | Development.fgl: | patg@krsna.patg.net | 2004-06-23 | 3 | -23/+25 |
* | | | Post-merge fix. | pem@mysql.com | 2004-07-23 | 1 | -16/+8 |
|\ \ \ | |/ / | |||||
| * | | First step of implementation of WL#1518 "make bundled zlib | konstantin@mysql.com | 2004-07-21 | 1 | -16/+8 |
* | | | - Added sql/parse_file.cpp and sql/sql_view.cpp to the mysqld and | lenz@mysql.com | 2004-07-16 | 2 | -5/+21 |
* | | | Merge with 4.1.3-beta | monty@mysql.com | 2004-07-07 | 85 | -8308/+271 |
|\ \ \ | |/ / | |||||
| * | | Added missing my_time.c file to mysqlclient project | monty@mysql.com | 2004-06-28 | 1 | -0/+4 |
| * | | - removed the VC++Files/InstallShield directory per Montys request | lenz@mysql.com | 2004-06-25 | 142 | -16165/+0 |
| * | | Many files: | patg@krsna.patg.net | 2004-06-25 | 68 | -0/+7790 |
| * | | Merge mysql.com:/space/my/mysql-4.1 | lenz@mysql.com | 2004-06-24 | 3 | -0/+12 |
| |\ \ | |||||
| | * | | - Windows compile fix: added missing file tztime.cpp to the mysqld | lenz@mysql.com | 2004-06-24 | 1 | -0/+4 |
| | * | | - Windows compile fix: added srv/srv0que.c to the innobase project | lenz@mysql.com | 2004-06-24 | 2 | -0/+8 |
| * | | | Fix for Bug#4030 "Client side conversion string -> date type doesn't | konstantin@mysql.com | 2004-06-24 | 3 | -0/+12 |
| |/ / | |||||
| * | | Including in enum_shutdown_level the 2 types of KILL of 5.0 | guilhem@mysql.com | 2004-06-21 | 1 | -1/+5 |
| * | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 | guilhem@mysql.com | 2004-06-21 | 1 | -5/+6 |
| |\ \ | |||||
| | * | | changing order of enum_shutdown_level (easier; we can test if we should die with | guilhem@mysql.com | 2004-06-21 | 1 | -5/+6 |
| * | | | merge | monty@mysql.com | 2004-06-21 | 4 | -77/+158 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge with 4.0.21 | monty@mysql.com | 2004-06-18 | 4 | -77/+158 |
| | |\ \ | | | |/ |