Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge | jimw@mysql.com | 2005-01-24 | 1 | -1/+2 |
|\ | |||||
| * | - renamed client_test -> mysql_client_test | lenz@mysql.com | 2005-01-20 | 1 | -0/+2 |
* | | merged | serg@serg.mylan | 2005-01-24 | 1 | -0/+1 |
* | | Merge with global tree | monty@mysql.com | 2005-01-15 | 1 | -0/+1 |
|\ \ | |||||
| * \ | Merge with 4.1 | monty@mysql.com | 2005-01-15 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | monty@mysql.com | 2005-01-06 | 1 | -41/+93 |
| | |\ | |||||
| * | | | Added ndb_types.h to ignore | monty@mysql.com | 2005-01-15 | 1 | -0/+1 |
* | | | | Merge | anjuta@arthur.local | 2005-01-13 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Bug in InnoDB; | anjuta@arthur.local | 2005-01-13 | 1 | -0/+1 |
* | | | | merged | serg@sergbook.mysql.com | 2005-01-06 | 1 | -0/+54 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | WL#964 | wax@kishkin.ru | 2005-01-03 | 1 | -0/+54 |
* | | | | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY | monty@mysql.com | 2005-01-03 | 1 | -0/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | added ndb/include/ndb_global.h ndb/include/ndb_version.h to ignore | monty@mysql.com | 2005-01-03 | 1 | -0/+2 |
| |/ / | |||||
| * | | Clean up the handling of "server" and "client" directories, while still avoid... | joerg@mysql.com | 2004-12-30 | 1 | -0/+2 |
* | | | Merge with 4.1 | monty@mishka.local | 2004-12-22 | 1 | -3/+6 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | corrected mysqltest.dsp | wax@kishkin.ru | 2004-12-14 | 1 | -0/+1 |
| * | Fix for a bug #6996 | Sinisa@sinisa.nasamreza.org | 2004-12-07 | 1 | -0/+2 |
* | | Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug; | anjuta@arthur.local | 2004-12-14 | 1 | -0/+1 |
* | | Added missing errmsg.txt | anjuta@arthur.local | 2004-12-13 | 1 | -0/+2 |
* | | merge | petr@mysql.com | 2004-12-09 | 1 | -0/+5 |
|\ \ | |||||
| * | | fix for the IM linking problem | petr@mysql.com | 2004-11-06 | 1 | -0/+4 |
| * | | protability fix | petr@mysql.com | 2004-11-04 | 1 | -0/+1 |
* | | | Merge with 4.1 | monty@mysql.com | 2004-12-06 | 1 | -0/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fixes to make mysql-test-run --embedded-server working | hf@deer.(none) | 2004-12-02 | 1 | -0/+3 |
| * | | - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows builds | lenz@mysql.com | 2004-11-22 | 1 | -0/+1 |
* | | | merged | serg@serg.mylan | 2004-11-20 | 1 | -2/+16 |
|\ \ \ | |/ / | |||||
| * | | ignore fix | tomas@poseidon.ndb.mysql.com | 2004-11-19 | 1 | -1/+1 |
| * | | added to ignore list | tomas@poseidon.ndb.mysql.com | 2004-11-19 | 1 | -0/+15 |
* | | | Fixed one warning and two errors reported by VC 6.0. | timour@mysql.com | 2004-11-18 | 1 | -0/+1 |
* | | | don't delete ac_available_languages_fragment in configure - it may be needed ... | serg@serg.mylan | 2004-11-16 | 1 | -0/+1 |
* | | | Merge bk-internal:/home/bk/mysql-5.0 | serg@serg.mylan | 2004-11-15 | 1 | -0/+1 |
|\ \ \ | |||||
| * \ \ | Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump) | brian@avenger.(none) | 2004-11-11 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | monty@mysql.com | 2004-11-09 | 1 | -0/+1 |
* | | | | Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa | serg@serg.mylan | 2004-11-11 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mysql.com | 2004-11-09 | 1 | -1/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge with 4.1 to get new thd->mem_root handling | monty@mysql.com | 2004-11-08 | 1 | -0/+1 |
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/| | |||||
| | | * | Ensure that even the (relatively new) "mysql-test/Makefile.am" gets into the ... | joerg@mysql.com | 2004-11-05 | 1 | -0/+1 |
* | | | | Merge sergbook.mylan:/usr/home/serg/Abk/mysql-5.0 | serg@sergbook.mylan | 2004-11-09 | 1 | -1/+83 |
|\ \ \ \ | |/ / / | |||||
| * | | | decimal.c: | serg@sergbook.mylan | 2004-11-08 | 1 | -0/+1 |
| |/ / | |||||
* | | | dbug: DBUG_EXECUTE_IF macro, build user manual automatically, document all fe... | serg@serg.mylan | 2004-11-04 | 1 | -82/+18 |
|/ / | |||||
* | | Merge on pull | monty@mysql.com | 2004-11-03 | 1 | -2/+15 |
|\ \ | |||||
| * \ | merge with 4.1 | monty@mysql.com | 2004-10-29 | 1 | -0/+13 |
| |\ \ | | |/ | |||||
| | * | s/puts/printf/ | serg@serg.mylan | 2004-10-21 | 1 | -0/+13 |
* | | | Fix for BUG#6303 + fix for discovered bug with sub-queries when analyzin quer... | timour@mysql.com | 2004-10-29 | 1 | -0/+2 |
|/ / | |||||
* | | Merge for post-merge fixes for Item_equal patch. | igor@rurik.mysql.com | 2004-10-19 | 1 | -0/+2 |
|\ \ | |||||
| * \ | Merge for Item_equal. | igor@rurik.mysql.com | 2004-10-09 | 1 | -0/+2 |
| |\ \ | |||||
| | * \ | Auto Merge | igor@rurik.mysql.com | 2003-12-23 | 1 | -1/+3 |
| | |\ \ | |||||
| | | * \ | Merge rurik.mysql.com:/home/igor/mysql-5.0 | igor@rurik.mysql.com | 2003-12-08 | 1 | -2/+3 |
| | | |\ \ | |||||
| | | * | | | The output of explain command for some queries has changed | igor@rurik.mysql.com | 2003-12-02 | 1 | -0/+2 |
* | | | | | | Merge bk-internal:/home/bk/mysql-5.0/ | serg@serg.mylan | 2004-10-18 | 1 | -1/+2 |
|\ \ \ \ \ \ |