Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main | stewart@mysql.com | 2005-12-28 | 1 | -1/+1 |
|\ | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.0/main | ||||
| * | BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete | serg@serg.mylan | 2005-12-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | for uca collation isalnum and strnncollsp don't agree on whether 0xC2A0 is a space (strnncollsp is right, isalnum is wrong). they still don't, the bug was fixed by avoiding strnncollsp | ||||
| * | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-12-04 | 2 | -2/+2 |
| |\ | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 | ||||
| | * | A set of Netware related patches. | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-12-04 | 2 | -2/+2 |
| | | | |||||
* | | | locking issues, | serg@serg.mylan | 2005-12-23 | 1 | -2/+3 |
| | | | | | | | | | | | | test for LONGLONG_MIN in decimal.c | ||||
* | | | Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 | SergeyV@selena. | 2005-12-01 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | | | | | into selena.:H:/MYSQL/src/#14902-mysql-5.0 | ||||
| * | | | Fixes bug #14902. When analysing a table with FT index that contains stopwords | SergeyV@selena. | 2005-11-23 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | table statistics is not updated, so the next execution of analyze table will try to update statistics again. | ||||
* | | | | Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 | serg@serg.mylan | 2005-11-26 | 1 | -1/+3 |
|\ \ \ \ | | |/ / | |/| | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0 | ||||
| * | | | followup for for the bug#5686 | serg@serg.mylan | 2005-11-26 | 1 | -1/+3 |
| | | | | |||||
* | | | | Merge the last 5.0.16 (Unix, Windows) and 5.0.16a (Netware) changes to the ↵ | joerg@mysql.com | 2005-11-21 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | general tree. | ||||
| * | | | | Netware specific changes for 5.0.16a | jamppa@suse9-x86.mysql.com | 2005-11-18 | 2 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 | bell@sanja.is.com.ua | 2005-11-15 | 1 | -1/+3 |
|\ \ \ \ | |/ / / |/| / / | |/ / | into sanja.is.com.ua:/home/bell/mysql/bk/work-bug6-5.0 | ||||
| * | | Fix for BUG#5686 - #1034 - Incorrect key file for table - only utf8 | svoj@mysql.com | 2005-11-12 | 1 | -1/+3 |
| | | | |||||
| * | | Merge mysql.com:/home/psergey/mysql-4.1-bug13814 | sergefp@mysql.com | 2005-11-08 | 1 | -0/+3 |
| |\ \ | | | | | | | | | | | | | into mysql.com:/home/psergey/mysql-4.1-nov08-push | ||||
| | * | | Fix for BUG#13814: in mi_pack_key(), when processing NULL value for TINYBLOB ↵ | sergefp@mysql.com | 2005-10-28 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | key segment, do advance the source pointer over 2 bytes that specify value length. | ||||
* | | | | Manually merged | evgen@moonbone.local | 2005-11-01 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Review of new pushed code | monty@mysql.com | 2005-11-01 | 1 | -1/+1 |
| |/ / | | | | | | | | | | | | | Removed wrong fix for bug #14009 (use of abs() on null value causes problems with filesort) Mark that add_time(), time_diff() and str_to_date() can return null values | ||||
* | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 | jani@ua141d10.elisa.omakaista.fi | 2005-10-27 | 8 | -56/+243 |
|\ \ \ | |/ / | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp | ||||
| * | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 | jani@ua141d10.elisa.omakaista.fi | 2005-10-25 | 2 | -5/+8 |
| |\ \ | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 | ||||
| | * | | Changed some dbug print options. | jani@ua141d10.elisa.omakaista.fi | 2005-10-25 | 2 | -5/+8 |
| | | | | |||||
| * | | | Added more tests for new UPDATE ... ORDER BY ... LIMIT optimization | monty@mysql.com | 2005-10-25 | 4 | -32/+32 |
| | | | | |||||
| * | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 | sergefp@mysql.com | 2005-10-23 | 4 | -28/+211 |
| |\ \ \ | | |/ / | |/| | | | | | | into mysql.com:/home/psergey/mysql-4.1-nulls-stats-r2 | ||||
| | * | | BUG#9622: post-review-fixes: better comments | sergefp@mysql.com | 2005-10-23 | 1 | -22/+32 |
| | | | | |||||
| | * | | BUG#9622, stage 2, work together with fix for BUG#12232: | sergefp@mysql.com | 2005-10-21 | 4 | -21/+194 |
| | | | | | | | | | | | | | | | | | | | | added "nulls_ignored" index statistics collection method for MyISAM tables. (notification trigger: this is about BUG#9622). | ||||
* | | | | 1.2048 05/10/20 10:31:16 ingo@mysql.com +1 -0 | ingo@mysql.com | 2005-10-26 | 1 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#12166 - Unable to index very large tables Moved clearing of errors behind the second repair attempt, but will clear only if no error happened. No test case. The error can be repeated with little free space on tmpdir only. I do not know of a way to create this in a portable way with our test suite. I did however attach a shell script to the bug report which can easily be adapted to the situation on the test machine. | ||||
* | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0 | hf@deer.(none) | 2005-10-15 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-5.0.12991 | ||||
| * | | | | Fix for bug #12991 (compile error --without-geometry) | hf@deer.(none) | 2005-09-09 | 1 | -1/+4 |
| | | | | | |||||
* | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp | jani@ua141d10.elisa.omakaista.fi | 2005-10-13 | 1 | -1/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 | ||||
| * | | | | Merge mysql.com:/usr/home/ram/work/mysql-4.0 | ramil@mysql.com | 2005-10-13 | 1 | -1/+1 |
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/| | into mysql.com:/usr/home/ram/work/mysql-4.1 | ||||
| | * | | memcpy_overlap() removed, as | ramil@mysql.com | 2005-10-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. it's wrong to use memcpy() for overlapped areas; 2. we use it only once. During merge to 4.1 will remove a memcpy_overlap() call from strings/ctype-tis620.c as well in order to fix bug #10836: ctype_tis620 test failure with ICC-compiled binaries on IA64. | ||||
* | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 | lars@mysql.com | 2005-10-10 | 2 | -22/+27 |
|\ \ \ \ | |/ / / | | | | | | | | | into mysql.com:/users/lthalmann/bk/mysql-5.0 | ||||
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | monty@mysql.com | 2005-10-07 | 2 | -22/+27 |
| |\ \ \ | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-4.1 | ||||
| | * | | | Review of new code since last pull | monty@mysql.com | 2005-10-07 | 2 | -22/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Use %lx instead of %p as %p is not portable - Don't replace ROW item with Item_null | ||||
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | serg@serg.mylan | 2005-10-08 | 2 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0 | ||||
| * | | | | | pthread_handler_decl() changed to be ctags-friendly | serg@serg.mylan | 2005-10-08 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | (and contain extern "C" when necessary) | ||||
* | | | | | | Merge mysql.com:/home/dellis/mysqlab/bk/local_mysql-4.1 | dean@mysql.com | 2005-10-06 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | into mysql.com:/home/dellis/mysqlab/bk/mysql-5.0 | ||||
| * | | | | Fix for BUG#13582. Theoretically possible to try to overallocate RAM in ↵ | dean@mysql.com | 2005-09-28 | 1 | -1/+2 |
| |/ / / | | | | | | | | | | | | | some fulltext queries. | ||||
| * | | | Merge mysql.com:/home/mydev/mysql-4.1 | ingo@mysql.com | 2005-09-26 | 4 | -7/+21 |
| |\ \ \ | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100 | ||||
* | \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-09-30 | 9 | -16/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc | ||||
| * | | | | | CHECKSUM TABLE now allows concurrent inserts | serg@serg.mylan | 2005-09-27 | 9 | -16/+16 |
| | | | | | | |||||
* | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-09-30 | 8 | -19/+24 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc | ||||
| * | | | | | Several fixes revelaled by Intel compiler. | jani@a193-229-222-105.elisa-laajakaista.fi | 2005-09-23 | 8 | -19/+24 |
| | | | | | | |||||
* | | | | | | Merge mysql.com:/home/mydev/mysql-5.0 | ingo@mysql.com | 2005-09-25 | 4 | -7/+21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-5000 | ||||
| * \ \ \ \ \ | Merge mysql.com:/home/mydev/mysql-4.1-4100 | ingo@mysql.com | 2005-09-23 | 4 | -7/+21 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | | | into mysql.com:/home/mydev/mysql-5.0-5000 | ||||
| | * | | | | Merge mysql.com:/home/mydev/mysql-4.0-4000 | ingo@mysql.com | 2005-09-23 | 4 | -7/+21 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | into mysql.com:/home/mydev/mysql-4.1-4100 | ||||
| | | * | | | Bug#9112 - Merge table with composite index producing invalid results with ↵ | ingo@mysql.com | 2005-09-23 | 4 | -7/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | some queries The problem was an ab-use of last_rkey_length. Formerly we saved the packed key length (of the search key) in this element. But in certain cases it got replaced by the (packed) result key length. Now we use a new element of MI_INFO to save the packed key length of the search key. | ||||
* | | | | | | Manually merged | sergefp@mysql.com | 2005-09-24 | 2 | -4/+4 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | BUG#12232: Addressing docs team feedback: s/inequal/unequal/ | sergefp@mysql.com | 2005-09-24 | 2 | -4/+4 |
| |/ / / | |||||
| * | | | Fix compiler error: C++ code in C | sergefp@mysql.com | 2005-09-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | aftermerge fix | serg@serg.mylan | 2005-09-21 | 1 | -3/+2 |
| | | | |