diff options
author | unknown <bell@sanja.is.com.ua> | 2005-04-01 02:14:30 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2005-04-01 02:14:30 +0300 |
commit | 9d7d3fb3a01c84f1b25d54426cf7c7c3e5afd7d2 (patch) | |
tree | bfd8839a822ffd9c3bcccaa970cc506139ae4a9c /regex/COPYRIGHT | |
parent | 1938b873d5c46b4f95edada1da66c15720cc74d2 (diff) | |
download | mariadb-git-9d7d3fb3a01c84f1b25d54426cf7c7c3e5afd7d2.tar.gz |
postmerge 4.1->5.0 fixes
mysql-test/r/group_by.result:
result change
mysql-test/r/union.result:
result change
mysql-test/r/view.result:
result change
mysql-test/t/subselect.test:
fixed mistake of merge
sql/field.cc:
new 5.0 types support
temporary table/db names detection in field fixed
sql/field.h:
removed non-existent methods
added wrongly deleted during manual merge string
sql/item.cc:
support of new types added to merge of union types routines
sql/item.h:
fixed method definition
sql/item_cmpfunc.cc:
fixed type
sql/item_func.h:
item type name fixed
sql/item_subselect.cc:
added forgoten methods
sql/item_subselect.h:
fixed type
sql/sql_derived.cc:
fixed typo of manual merge
sql/sql_view.cc:
added new parameter
Diffstat (limited to 'regex/COPYRIGHT')
0 files changed, 0 insertions, 0 deletions