summaryrefslogtreecommitdiff
path: root/sql/item.h
Commit message (Expand)AuthorAgeFilesLines
* merge 4.1->5.0bell@sanja.is.com.ua2005-03-311-16/+16
|\
| * Mergebell@sanja.is.com.ua2005-03-301-16/+16
| |\
| | * fixed union types merging and table related metadata (BUG#8824)bell@sanja.is.com.ua2005-03-231-16/+16
* | | after merge fixgluh@gluh.mysql.r18.ru2005-03-171-1/+0
* | | Merge 4.1 -> 5.0gluh@gluh.mysql.r18.ru2005-03-171-0/+12
|\ \ \ | |/ /
| * | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2005-03-161-0/+11
| |\ \ | | |/ | |/|
| | * olap.result, olap.test:igor@rurik.mysql.com2005-03-151-0/+11
| * | Fix for bug#8656: Crash with group_concat on alias in outer tablegluh@gluh.mysql.r18.ru2005-03-161-0/+1
| |/
* | WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) andkonstantin@mysql.com2005-03-131-0/+114
* | Mergebar@mysql.com2005-03-051-8/+4
|\ \ | |/
| * type_blob.result, func_system.result, func_str.result, ctype_collate.result:bar@mysql.com2005-03-041-8/+4
* | Merged from 4.1jimw@mysql.com2005-03-031-0/+7
|\ \ | |/
| * Comments added sergefp@mysql.com2005-03-031-0/+2
| * Fix for BUG#8562: In Item_int_with_ref::new_item() create Item_int or Item_uintsergefp@mysql.com2005-02-281-0/+5
| * Backport my_strntod() from 5.0monty@mysql.com2005-02-221-2/+4
* | bug#8151 - truncate leaves a transaction openserg@serg.mylan2005-03-021-6/+5
* | Mergemskold@mysql.com2005-02-211-1/+11
|\ \
| * | use dbug_print_decimal instead of DBUG_EXECUTEmonty@mysql.com2005-02-201-4/+0
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-02-191-0/+4
| |\ \
| | * | Changes and fixes for windows compilationgeorg@beethoven.site2005-02-181-0/+4
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-02-191-0/+10
| |\ \ \ | | |/ / | |/| |
| | * | Fixed BUILD script to use --with-berkeley-db instead of --with-bdbmonty@mysql.com2005-02-191-0/+10
* | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmskold@mysql.com2005-02-171-1/+1
|\ \ \ \ | |/ / /
| * | | Manual mergeigor@rurik.mysql.com2005-02-171-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | item.h:igor@rurik.mysql.com2005-02-161-1/+1
* | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmskold@mysql.com2005-02-161-1/+4
|\ \ \ \ | |/ / /
| * | | Fixed BUG#8540: Local variable overrides an alias.pem@mysql.comhem.se2005-02-161-1/+4
| | |/ | |/|
* | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmskold@mysql.com2005-02-161-2/+1
|\ \ \ | |/ /
| * | Merge with 4.1monty@mysql.com2005-02-151-2/+1
| |\ \ | | |/
| | * Fix signatures of placement operator delete in places where placement konstantin@mysql.com2005-02-151-1/+1
* | | Mergemskold@mysql.com2005-02-111-177/+240
|\ \ \ | |/ /
| * | Merge with 4.1monty@mysql.com2005-02-101-0/+3
| |\ \ | | |/
| | * Better bugfix for "HAVING when refering to RAND()" (Bug #8216)monty@mysql.com2005-02-081-0/+3
| * | Precision Math implementationhf@deer.(none)2005-02-091-175/+235
| * | Merge changesjimw@mysql.com2005-02-041-2/+2
| |\ \ | | |/
| | * A fix: bug#6931: Date Type column problem when using UNION-Tablegluh@gluh.mysql.r18.ru2005-02-041-2/+2
* | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbmskold@mysql.com2005-01-211-4/+6
|\ \ \ | |/ /
| * | After merge fixesmonty@mysql.com2005-01-151-4/+6
* | | Mergemskold@mysql.com2005-01-031-4/+76
|\ \ \ | |/ /
| * | After merge fixesmonty@mysql.com2004-12-311-2/+2
| * | Merge with 4.1monty@mishka.local2004-12-221-4/+76
| |\ \ | | |/
| | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2004-12-141-1/+1
| | |\
| | | * bug#6275 "client_test" fail in 4.1.7 make testbar@mysql.com2004-12-141-1/+1
| | * | A quick fix for bug #7257: Crash in default tests: 'subselect'ram@gw.mysql.r18.ru2004-12-141-2/+2
| | |/
| | * * Added comments and one assertsergefp@mysql.com2004-12-141-0/+1
| | * Merge of fix for BUG#6976 continued: pulling in some Item_ref changes from 5.0sergefp@mysql.com2004-12-141-19/+22
| | * Merged fixes for BUG#6976 and BUG#7079sergefp@mysql.com2004-12-131-0/+4
| | * Merged (will need a post-merge fix)sergefp@mysql.com2004-12-131-0/+21
| | |\
| | | * Merging fix for BUG#6976 from 4.0 to 4.1 sergefp@mysql.com2004-12-131-0/+21
| | * | comment of class eddedbell@sanja.is.com.ua2004-12-131-0/+4