summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* resolving conflictsunknown2004-03-304-39/+48
|\
| * An improvement ofunknown2004-03-301-6/+10
| * Fix for the bug #2976: NATURAL JOIN produces duplicate columns.unknown2004-03-194-41/+46
* | false/true -> FALSE/TRUEunknown2004-03-3018-67/+165
* | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-301-1/+5
|\ \
| * | Better comment.unknown2004-03-301-1/+5
* | | Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1unknown2004-03-301-0/+2
|\ \ \
| * | | Fix test results when you are in daylight saving timeunknown2004-03-301-0/+2
* | | | Merge with 4.0 to get lastest bug fixesunknown2004-03-2914-116/+165
|\ \ \ \ | |/ / /
| * | | Fixed wrong assert (Got failure in ctype_tis620)unknown2004-03-291-1/+1
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-299-4/+106
| |\ \ \
| | * | | some cleanup of last patch for BUG #2342unknown2004-03-272-1/+10
| | * | | Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-275-0/+64
| | |\ \ \
| | | * | | fixed bug #2342 unknown2004-03-275-0/+64
| | * | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-261-1/+1
| | |\ \ \ \
| | | * \ \ \ Merge heikki@build.mysql.com:/home/bk/mysql-4.0unknown2004-03-261-1/+1
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | mem0dbg.c:unknown2004-03-261-1/+1
| | * | | | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-263-3/+32
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | order_by.result:unknown2004-03-263-3/+32
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.0unknown2004-03-263-1/+43
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Allow keys with 0 segements in MyISAMunknown2004-03-263-1/+43
| * | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0unknown2004-03-263-6/+65
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | fixed BUG in query cahe statistic countingunknown2004-03-213-6/+65
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-295-20/+46
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Disable INSERT DELAYED for embedded libraryunknown2004-03-295-20/+46
* | | | | | | Better error messages for not nullableunknown2004-03-293-2/+13
* | | | | | | Better tests for BINARYunknown2004-03-294-0/+95
* | | | | | | Checking Thai sort order and trailing spaces handlingunknown2004-03-293-27/+2863
* | | | | | | sql_db.cc:unknown2004-03-291-0/+2
* | | | | | | Simplification: MYSQL_RES *result replaced with MYSQL_DATA result;unknown2004-03-285-112/+88
* | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-271-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Small fix to embedded libraryunknown2004-03-271-0/+1
* | | | | | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-03-275-0/+56
|\ \ \ \ \ \ \ \
| * | | | | | | | fixed bug #2342 unknown2004-03-275-0/+56
* | | | | | | | | A previous changeset by me today about SQL_LOG_BIN had the problemunknown2004-03-274-73/+90
* | | | | | | | | Merge gbichot@213.136.52.20:/home/bk/mysql-4.1unknown2004-03-268-28/+46
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Changing SET SQL_LOG_BIN so that it explicitely throws an error ifunknown2004-03-265-16/+29
| * | | | | | | | To save 32KB memory per thread when --log-bin is not used, we do notunknown2004-03-263-12/+17
* | | | | | | | | mem0dbg.c:unknown2004-03-261-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1unknown2004-03-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | typo in comment fixedunknown2004-03-261-1/+1
* | | | | | | | | UTF8 now process space as PAD character correctly.unknown2004-03-265-8/+170
* | | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2004-03-261-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | bad merge (?) fixedunknown2004-03-261-1/+1
* | | | | | | | | | 1. New data types, from the user point of view:unknown2004-03-2618-67/+78
|/ / / / / / / / /
* | | | | | | | | version updated after merge :)unknown2004-03-261-1/+1
* | | | | | | | | charset2html.c:unknown2004-03-261-3/+15
* | | | | | | | | After merge fixes + simple optimizationsunknown2004-03-265-10/+10
* | | | | | | | | Merge with 4.0unknown2004-03-2518-90/+148
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Updated tests after mergeunknown2004-03-252-33/+42