summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-201-23/+10
|\
| * Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1unknown2005-06-201-23/+10
| |\
| | * ha_ndbcluster.cc:unknown2005-06-201-23/+10
* | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-2011-44/+104
|\ \ \ | |/ /
| * | correcting error messages after discussion with Paul (replication of routines).unknown2005-06-191-3/+3
| * | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-06-1810-38/+57
| |\ \
| * \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-06-177-34/+29
| |\ \ \
| * \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-06-1710-41/+101
| |\ \ \ \
| | * | | | fixed printing of sum(distinct ) & avg(distinct ) & cast(... as decimal) (BU...unknown2005-06-1710-41/+101
* | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-1810-38/+57
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-1710-38/+57
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Bug#6877 MySQL should give an error if the requested table type is not availableunknown2005-06-1710-38/+57
* | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-1720-158/+153
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-177-34/+29
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Rename all prepared statements COM_ commands to prefix with COM_STMT_unknown2005-06-177-34/+29
| | |/ / /
| * | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-06-171-2/+4
| |\ \ \ \ | | |/ / /
| * | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-06-175-47/+107
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-06-161-3/+8
| |\ \ \ \
| * \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2005-06-163-19/+35
| |\ \ \ \ \
| * \ \ \ \ \ mergedunknown2005-06-161-5/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2005-06-1517-124/+124
| |\ \ \ \ \ \ \
| | * | | | | | | renamed:unknown2005-06-1517-124/+124
* | | | | | | | | ha_ndbcluster.cc:unknown2005-06-171-1/+1
* | | | | | | | | Merge dl145c:tomas/mysql-5.0unknown2005-06-171-2/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1unknown2005-06-171-2/+4
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | sql_select.cc:unknown2005-06-171-2/+4
* | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-175-47/+107
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Post-merge fixes.unknown2005-06-175-16/+17
| * | | | | | | Manual merge (4.1->5.0)unknown2005-06-174-46/+105
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Fix Bug#9334 "PS API queries in log file" and unknown2005-06-174-28/+64
| | * | | | | A fix for Bug#9141 "4.1 does not log into slow log unknown2005-06-164-19/+36
| | | |_|/ / | | |/| | |
* | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-161-8/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Manual mergeunknown2005-06-161-8/+14
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | group_by.result, group_by.test:unknown2005-06-161-3/+8
| | |/ / /
| | * | | for consictency, changed to use memcpy_fixed.unknown2005-06-161-5/+6
| | * | | cleanup for bug#11167.unknown2005-06-151-5/+5
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-163-19/+35
|\ \ \ \ \ | |/ / / /
| * | | | Fix for bug#9434 SHOW CREATE DATABASE `information_schema`;unknown2005-06-161-15/+22
| * | | | Fix for bug#11055: information_schema: routines.sql_data_access has wrong valueunknown2005-06-163-4/+13
| | |/ / | |/| |
* | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-1519-97/+182
|\ \ \ \ | |/ / /
| * | | Manual mergeunknown2005-06-152-9/+32
| |\ \ \
| | * | | cast.result, cast.test:unknown2005-06-152-9/+32
| * | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-06-151-1/+8
| |\ \ \ \
| | * | | | Fix for bug #10337 (cast(NULL DECIMAL) crashes the server)unknown2005-06-151-1/+8
| * | | | | Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-1510-41/+47
| |\ \ \ \ \
| | * | | | | Added comment after Serg's reviewunknown2005-06-151-0/+2
| | * | | | | Fix for bug #11174 (can't determine hostname under Windows 64-bit)unknown2005-06-151-13/+13
| | * | | | | Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-149-28/+32
| | |\ \ \ \ \
| | | * | | | | fixes for windows 64-bit compiler warningsunknown2005-06-139-28/+32
| * | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-06-151-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |