summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-07-135-30/+10
|\
| * Merge mysql.com:/opt/local/work/mysql-4.1-11458konstantin@mysql.com2005-07-135-30/+10
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1konstantin@mysql.com2005-07-137-34/+21
| | |\
| | | * - a fix for Bug#11458 "Prepared statement with subselects return random konstantin@mysql.com2005-07-137-34/+21
* | | | sql_update.cc:marko@hundin.mysql.fi2005-07-131-0/+2
|/ / /
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-07-131-2/+15
|\ \ \
| * | | Post-merge fixgluh@eagle.intranet.mysql.r18.ru2005-07-131-2/+3
| * | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1gluh@mysql.com2005-07-131-2/+14
| |\ \ \ | | |/ /
| | * | Bug #9854 hex() and out of range handlinggluh@eagle.intranet.mysql.r18.ru2005-07-131-2/+14
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2005-07-1312-194/+386
|\ \ \ \ | |/ / / |/| | |
| * | | Implementation of Monty's idea: Now we can open mysql.proc table for lookupdlenev@mysql.com2005-07-1312-193/+386
* | | | Fix for bug#11685 SHOW TABLES; doesn't update Com_show_tablesgluh@eagle.intranet.mysql.r18.ru2005-07-131-2/+5
* | | | Manual mergelars@mysql.com2005-07-131-2/+0
* | | | Merge mysql.com:/home/bkroot/mysql-5.0lars@mysql.com2005-07-133-1/+31
|\ \ \ \
| * \ \ \ Mergekent@mysql.com2005-07-131-1/+1
| |\ \ \ \
| | * | | | sql_insert.cc:kent@mysql.com2005-07-081-1/+1
| * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0evgen@moonbone.local2005-07-132-0/+30
| |\ \ \ \ \
| | * \ \ \ \ Mergeevgen@moonbone.local2005-07-122-0/+30
| | |\ \ \ \ \
| | | * | | | | Fix bug#11709 View was ordered by wrong column.evgen@moonbone.local2005-07-122-0/+30
* | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1lars@mysql.com2005-07-136-7/+30
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fixed some vio code that was using ___WIN__ instead of __WIN__reggie@linux.site2005-07-121-1/+1
| * | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-11643jimw@mysql.com2005-07-123-6/+24
| |\ \ \ \ \ \
| | * | | | | | Fix crash caused by calling DES_ENCRYPT() without the --des-key-filejimw@mysql.com2005-07-073-6/+24
| * | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1lars@mysql.com2005-07-121-2/+6
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | BUG#6987: Added note when stat is failing on relay log, added mutex for log r...lars@mysql.com2005-07-122-0/+4
* | | | | | | | view.test, view.result:igor@igor-inspiron.creware.com2005-07-121-0/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0igor@igor-inspiron.creware.com2005-07-122-8/+22
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0sergefp@mysql.com2005-07-121-2/+6
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Fix for BUG#11821 manually mergedsergefp@mysql.com2005-07-121-2/+6
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Fix for BUG#11821: Make Item_type_holder be able to work with MIN(field), sergefp@mysql.com2005-07-121-2/+6
| | | |/ / / / /
| * | | | | | | Mergeevgen@moonbone.local2005-07-121-6/+16
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fix bug #11399 Column alias was lost during view preraration.evgen@moonbone.local2005-07-121-6/+16
* | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0igor@igor-inspiron.creware.com2005-07-122-0/+14
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | view.result, view.test:igor@igor-inspiron.creware.com2005-07-122-0/+14
* | | | | | | | Merge mysql.com:/usr/home/bar/mysql-4.1bar@mysql.com2005-07-121-13/+20
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | field_conv.cc:bar@mysql.com2005-07-111-1/+1
| * | | | | | | field_conv.cc:bar@mysql.com2005-07-111-13/+20
| * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/bug11635/my41-bug11635msvensson@neptunus.(none)2005-07-071-3/+3
| |\ \ \ \ \ \ \
| | * | | | | | | BUG#11635 mysqldump exports TYPE instead of USING for HASH Cluster indexesmsvensson@neptunus.(none)2005-07-071-3/+3
* | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-07-111-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ha_archive.cc:reggie@linux.site2005-07-111-1/+1
* | | | | | | | | | Post-review fix.pem@mysql.com2005-07-111-1/+3
* | | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-07-111-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | sql_insert.cc:reggie@linux.site2005-07-111-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-07-1114-371/+591
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0brian@brian-akers-computer.local2005-07-102-121/+134
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed 32bit issue, reworked error logic for open tables, and redid the repair...brian@brian-akers-computer.local2005-07-101-76/+25
| | * | | | | | | | Refactoring of write_row() into two parts to allow future additions. Also rew...brian@brian-akers-computer.local2005-07-102-45/+109
| * | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0brian@zim.(none)2005-07-1012-248/+451
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Manual fixes after merging patch for bug #8406 "Triggers crash if referencingdlenev@mysql.com2005-07-093-7/+5