summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Post-merge fixes.unknown2005-07-153-2/+17
* Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2005-07-153-13/+37
|\
| * Hastily remove an occasionally checked in symlink :(unknown2005-07-150-0/+0
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-154-13/+53
| |\
| | * A fix and a test case for Bug#11299 "prepared statement makes wrong SQLunknown2005-07-154-13/+53
| * | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-141-5/+1
| |\ \ | | |/ | |/|
| | * fixed function sig so it will compile with Visual C++ 8unknown2005-07-141-5/+1
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-143-2/+4
|\ \ \
| * | | Post-merge fixes.unknown2005-07-143-2/+4
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-144-8/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Get rid of checking for ETIME return value of pthread_cond_timedwait.unknown2005-07-144-8/+8
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-1415-73/+397
|\ \ \ \
| * \ \ \ Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2005-07-142-0/+57
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | A fix and a test case for Bug#11183 "mysql_stmt_reset() doesn't resetunknown2005-07-142-0/+57
| * | | | Merge mysql.com:/opt/local/work/mysql-4.1-rootunknown2005-07-1414-73/+340
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-146-3/+243
| | |\ \
| | | * \ Merge mysql.com:/home/psergey/mysql-4.1-build-treeunknown2005-07-146-3/+243
| | | |\ \
| | | | * | Fix for BUG#11869: In Item_func_match::fix_index() handle the case when there...unknown2005-07-143-0/+158
| | | | * | Fix for BUG#11700: in add_not_null_conds(), call full fix_fields() for the cr...unknown2005-07-143-3/+85
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-148-70/+101
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | A fix and a test case for Bug#9735.unknown2005-07-148-70/+101
* | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-07-144-21/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix for bug #10929 (type_newdecimal.test requires InnoDB)unknown2005-07-144-21/+21
* | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-145-45/+34
|\ \ \ \ \ \
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-145-45/+34
| |\ \ \ \ \ \
| | * | | | | | Implement MarkM optimization request to avoid redundnat packet exchangeunknown2005-07-145-45/+34
* | | | | | | | item.cc:unknown2005-07-141-1/+1
* | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1.num-convunknown2005-07-145-4/+66
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-145-4/+66
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | ctype_utf8.result:unknown2005-07-135-4/+66
* | | | | | | valgrind error fix(uninitialiased variable)unknown2005-07-142-2/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-143-5/+11
|\ \ \ \ \ \
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-140-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-130-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merging separate commits into 5.0.9-beta build clone and general BK tree.unknown2005-07-134-12/+11
| | | |\ \ \ \ \ \
| * | | \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-143-5/+11
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Now when we create or drop trigger we will open only subject table and notunknown2005-07-133-5/+11
* | | | | | | | | | Post-merge fixes.unknown2005-07-141-4/+6
* | | | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-9379unknown2005-07-142-0/+32
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | A test case for Bug#9442 "Set parameter make query fail if column unknown2005-07-142-0/+32
* | | | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-9379unknown2005-07-134-1/+51
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | / / / / / / / / | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | A fix and a test case for Bug#9379 (collation of a parameter marker is unknown2005-07-134-1/+52
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge mysql.com:/opt/local/work/mysql-4.1-11458unknown2005-07-131-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-131-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | 4.1.13 has been cloned offunknown2005-07-131-2/+2
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Cleanup after test for Bug#11458unknown2005-07-132-1/+4
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-137-30/+135
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge mysql.com:/opt/local/work/mysql-4.1-11458unknown2005-07-137-30/+135
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | / / / / / | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-07-139-34/+146
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | - a fix for Bug#11458 "Prepared statement with subselects return random unknown2005-07-139-34/+146