summaryrefslogtreecommitdiff
path: root/sql/item.cc
Commit message (Collapse)AuthorAgeFilesLines
* postmerge fixbell@sanja.is.com.ua2005-11-231-1/+0
|
* Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0bell@sanja.is.com.ua2005-11-231-0/+7
|\ | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
| * Fix for BUG#13549 "Server crash with nested stored proceduresbell@sanja.is.com.ua2005-11-231-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | if inner routine has more local variables than outer one, and one of its last variables was used as argument to NOT operator". THD::spcont was non-0 when we were parsing stored routine/trigger definition during execution of another stored routine. This confused methods of Item_splocal and forced them use wrong runtime context. Fix ensures that we always have THD::spcont equal to zero during routine/trigger body parsing. This also allows to avoid problems with errors which occur during parsing and SQL exception handlers.
* | Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0bell@sanja.is.com.ua2005-11-211-8/+8
|\ \ | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.0
| * | Inefficient usage of String::append() fixed.bell@sanja.is.com.ua2005-11-201-8/+8
| | | | | | | | | | | | | | | | | | | | | Bad examples of usage of a string with its length fixed. The incorrect length in the trigger file configuration descriptor fixed (BUG#14090). A hook for unknown keys added to the parser to support old .TRG files.
* | | Fix for BUG#14662: view column in ORDER BY considered ambiguous if SELECT ↵timour@mysql.com2005-11-111-11/+20
|/ / | | | | | | | | | | | | | | | | contains the same column as an aliased and as a non-aliased column. The problem was that Item_direct_view_ref::eq() was first comparing view columns by name, and in this case the name of one of them is different since it is aliased.
* | Reverting patch for BUG #14009 (use of abs() on null value causes problems ↵monty@mysql.com2005-11-011-5/+7
| | | | | | | | | | | | with filesort Fix for bug #14536: SELECT @a,@a:=... fails with prepared statements
* | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-10-281-1/+10
|\ \ | | | | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
| * | Merge 4.1 - 5.0jani@ua141d10.elisa.omakaista.fi2005-10-281-1/+2
| | |
| * | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1jani@ua141d10.elisa.omakaista.fi2005-10-271-0/+8
| |\ \ | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
| | * | Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATEevgen@moonbone.local2005-10-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VALUES() can only refer to table insert going to. But Item_insert_value::fix_fields() were passing to it's arg full table list, This results in finding second column which shouldn't be found, and failing with error about ambiguous field. Item_insert_value::fix_fields() now passes only first table of full table list.
* | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2005-10-281-10/+6
|\ \ \ \ | |/ / / |/| | | | | | | into sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0
| * | | support of view underlying tables and SP functions security check added ↵bell@sanja.is.com.ua2005-10-281-10/+6
| | | | | | | | | | | | | | | | (BUG#9505) (WL#2787)
* | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanjimw@mysql.com2005-10-261-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | compilation failure fixedserg@serg.mylan2005-10-211-1/+1
| | | |
* | | | Bug#12371: executing prepared statement fails (illegal mix of collations)bar@mysql.com2005-10-201-1/+27
| |/ / |/| | | | | | | | | | | | | | | | | | | | ctype_utf8.test, ctype_utf8.result: Adding test case. item.h: item.cc: Adding Item_param::safe_charset_converter
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-10-131-2/+2
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| * | | Fixes during review of new pushed codemonty@mysql.com2005-10-131-2/+2
| | | |
* | | | Manual merge of bug fix #7672evgen@moonbone.local2005-10-131-0/+16
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Manual mergedevgen@moonbone.local2005-10-131-0/+15
| |\ \
| | * | select.test, sql_select.cc, sql_lex.cc, item.cc:evgen@moonbone.local2005-10-131-3/+8
| | | | | | | | | | | | | | | | Bug #7672 after merge fix
| | * | Manual merge, fix for bug #7672evgen@moonbone.local2005-10-121-0/+10
| | |\ \
| | | * | Fix bug#7672 Unknown column error in order clauseevgen@moonbone.local2005-10-091-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When fixing Item_func_plus in ORDER BY clause field c is searched in all opened tables, but because c is an alias it wasn't found there. This patch adds a flag to select_lex which allows Item_field::fix_fields() to look up in select's item_list to find aliased fields.
| | | * | Fix for BUG#6976:sergefp@mysql.com2004-12-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Item_ref::Item_ref set maybe_null (and other fields fix_fields sets) to be the same as in (*ref), because Item_ref::fix_fields() will not be called. Previously maybe_null was 0 always and this produced a bogus state where maybe_null==0 && is_null() == true which broke evaluation for some upper-level Items, like AND and OR.
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-10-121-26/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-10-081-26/+20
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | into mysql.com:/home/my/mysql-5.0
| | * | | | Review of code pushed since last 5.0 pull:monty@mysql.com2005-10-061-26/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that ccache is also used for C programs mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter Fixed test cases by adding missing DROP's and rename views to be of type 'v#' Removed MY_UNIX_PATH from fn_format() Removed current_db_used from TABLE_LIST Removed usage of 'current_thd' in Item_splocal Removed some compiler warnings A bit faster longlong2str code
* | | | | | Merginghf@deer.(none)2005-10-111-1/+22
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1hf@deer.(none)2005-10-101-2/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into deer.(none):/home/hf/work/mysql-4.1.13372
| | * | | | | additional fix to the bug #13372 (decimal union)hf@deer.(none)2005-09-271-2/+2
| | | | | | |
| | * | | | | Fix for bug #13372 (decimal union)hf@deer.(none)2005-09-271-2/+22
| | | |_|/ / | | |/| | |
* | | | | | Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1lars@mysql.com2005-10-101-22/+11
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | into mysql.com:/users/lthalmann/bk/mysql-5.0
| * | | | Review of new code since last pullmonty@mysql.com2005-10-071-22/+11
| | | | | | | | | | | | | | | | | | | | | | | | | - Use %lx instead of %p as %p is not portable - Don't replace ROW item with Item_null
* | | | | Fix for BUG#13410 - qualified reference to a view column in the HAVING ↵timour@mysql.com2005-10-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clause cannot be resolved. The problem was then when a column reference was resolved to a view column, the new Item created for this column contained the name of the view, and not the view alias.
* | | | | Merge mysql.com:/usr/local/bk/mysql-5.0pem@mysql.com2005-09-291-2/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/pem/mysql-5.0
| * | | | | Fixed BUG#12589: Assert when creating temp. table from decimal storedpem@mysql.com2005-09-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | procedure variable Second version, after review. Keep the unsigned_flag in Item_decimal updated. Note that this also changed the result of several old test results - creating tables from decimal templates now gives unsigned columns and different sizes. (Several tests had Length > Max_length before.)
* | | | | | select.result, item.cc:evgen@moonbone.local2005-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | After merge fix for bug#13356
* | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2005-09-281-0/+29
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | | | | Fix bug#13356 resolve_const_item() wasn't able to handle Item_row items.evgen@moonbone.local2005-09-281-0/+29
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolve_const_item() assumed to be not called for Item_row items. For ensuring that DBUG_ASSERT(0) was set there. This patch adds section for Item_row items. If it can it recursively calls resolve_const_item() for each item the Item_row contains. If any of the contained items is null then whole Item_row substitued by Item_null. Otherwise it just returns.
| * | | | Bug#12817 SHOW STATUS now blob fieldsgluh@eagle.intranet.mysql.r18.ru2005-09-091-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fix is cancellation of ChangeSet 1.2329 05/07/12 08:35:30 reggie@linux.site +8 -0 Bug 7142 Show Fields from fails using Borland's dbExpress interface The reason is we can't fix bug#7142 without breaking of existing applications/APIs that worked fine with earlier 4.1 bug 7142 is fixed in 5.0
| * | | | manual merge of bug fix#12537evgen@moonbone.local2005-08-301-2/+4
| |\ \ \ \
| | * | | | Fix bug #12537 UNION produces longtext instead of varcharevgen@moonbone.local2005-08-301-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Item::tmp_table_field_from_field_type() and create_tmp_field_from_item() was converting string field to blob depending on byte-wise length instead of character length, which results in converting valid varchar string with length == 86 to longtext. Made that functions above take into account max width of character when converting string fields to blobs.
| * | | | | ctype_utf8.result, ctype_utf8.test, item.cc:bar@mysql.com2005-08-291-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#12371 executing prepared statement fails (illegal mix of collations) After review fixes.
| * | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1bar@mysql.com2005-08-291-0/+20
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/bar/mysql-4.1.b12371
| | * | | | | Bug#12371 executing prepared statement fails (illegal mix of collations)bar@mysql.com2005-08-061-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | item.cc: item.h: Adding Item_param::safe_charset_converter, not to return collation mix error if parameter can be converted into operation character set. ctype_utf8.result: adding test case ctype_utf8.test: adding test case
* | | | | | | item.cc:igor@rurik.mysql.com2005-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug #13410. Fixed name resolution for qualified reference to a view column in the HAVING clause. view.result, view.test: Added a test case for bug #13410.
* | | | | | | sql_base.cc, item.cc:igor@rurik.mysql.com2005-09-261-3/+3
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug #13411. Fixed name resolution for non-qualified reference to a view column in the HAVING clause. view.result, view.test: Added a test case for bug #13411.
* | | | | | WL#2787 (part 2, ver 3 (merged)) changed securety context switchingbell@sanja.is.com.ua2005-09-151-2/+2
| |_|_|/ / |/| | | |
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2005-09-141-9/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
| * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.mysql.fi2005-09-141-8/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mishka.mysql.fi:/home/my/mysql-5.0
View Lorry Controller Status