sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/subselect.result:
SCCS merged
mysql-test/t/subselect.test:
SCCS merged
sql/item.h:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Compatibility syntax: SERIAL, [PRIMARY] KEY and VALUE
sql/sql_lex.cc:
Faster handling of identifiers
sql/sql_lex.h:
Faster handling of identifiers
sql/sql_yacc.yy:
Added SERIAL (alias for bigint auto_increment)
Make PRIMARY optional in field specification
Make VALUE alias for VALUES
mysql-test/t/subselect.test:
after merging fix
sql/sql_lex.cc:
after merging fix
sql/sql_update.cc:
after merging fix
sql/sql_yacc.yy:
after merging fix
This is required for prepared statements and stored procedures.
BitKeeper/etc/ignore:
Added bkpull.log bkpull.log.2 bkpull.log.3 build.log sql/safe_to_cache_query.txt to the ignore list
sql/item_create.cc:
Moved safe_to_cache_query from thd to lex.
sql/item_func.cc:
Moved safe_to_cache_query from thd to lex.
sql/sql_cache.cc:
Moved safe_to_cache_query from thd to lex.
Note: Query_cache::is_cacheable() has both a thd and lex argument.
We assumed that it's the lex->safe_to_cache_query we should test.
sql/sql_class.cc:
Moved safe_to_cache_query from thd to lex.
sql/sql_class.h:
Moved safe_to_cache_query from thd to lex.
sql/sql_lex.cc:
Moved safe_to_cache_query from thd to lex.
We set it to 1 initially. It's then set to 0 in cases where
it's know not to be safe. (Before this change, it was set to
0 in thd, and then set to 1 before parsing.)
sql/sql_lex.h:
Moved safe_to_cache_query from thd to lex.
sql/sql_parse.cc:
Moved safe_to_cache_query from thd to lex.
No point in setting it here now, it's set in lex_start() later.
sql/sql_prepare.cc:
Moved safe_to_cache_query from thd to lex.
Must set it after lex_start() has been called.
sql/sql_yacc.yy:
Moved safe_to_cache_query from thd to lex.
New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0
include/mysqld_error.h:
New warning message
mysql-test/r/func_system.result:
Added testing of new functions
mysql-test/r/func_test.result:
Added testing of new functions
mysql-test/r/type_blob.result:
Added testing of new functions
mysql-test/t/func_system.test:
Added testing of new functions
mysql-test/t/func_test.test:
Added testing of new functions
mysql-test/t/type_blob.test:
Added testing of new functions
sql/item_func.cc:
Added function DIV
sql/item_func.h:
Added function DIV
sql/lex.h:
New keywords
sql/share/czech/errmsg.txt:
New warning message
sql/share/danish/errmsg.txt:
New warning message
sql/share/dutch/errmsg.txt:
New warning message
sql/share/english/errmsg.txt:
New warning message
sql/share/estonian/errmsg.txt:
New warning message
sql/share/french/errmsg.txt:
New warning message
sql/share/german/errmsg.txt:
New warning message
sql/share/greek/errmsg.txt:
New warning message
sql/share/hungarian/errmsg.txt:
New warning message
sql/share/italian/errmsg.txt:
New warning message
sql/share/japanese/errmsg.txt:
New warning message
sql/share/korean/errmsg.txt:
New warning message
sql/share/norwegian-ny/errmsg.txt:
New warning message
sql/share/norwegian/errmsg.txt:
New warning message
sql/share/polish/errmsg.txt:
New warning message
sql/share/portuguese/errmsg.txt:
New warning message
sql/share/romanian/errmsg.txt:
New warning message
sql/share/russian/errmsg.txt:
New warning message
sql/share/serbian/errmsg.txt:
New warning message
sql/share/slovak/errmsg.txt:
New warning message
sql/share/spanish/errmsg.txt:
New warning message
sql/share/swedish/errmsg.txt:
New warning message
Translated a lot of error messages
sql/share/ukrainian/errmsg.txt:
New warning message
sql/sql_class.cc:
Added support for warnings during parsing
sql/sql_class.h:
Added support for warnings during parsing
sql/sql_error.cc:
Added support for warnings during parsing
sql/sql_lex.cc:
Fixed comment
sql/sql_parse.cc:
Added automatic conversion from CHAR(length) to BLOB when length > 255
Added support for BLOB(length)
sql/sql_yacc.yy:
New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0
include/mysql_com.h:
basic row Items
include/mysqld_error.h:
more wide error mening
libmysqld/Makefile.am:
basic row Items
mysql-test/r/subselect.result:
more wide error mening
sql/Makefile.am:
basic row Items
sql/filesort.cc:
basic row Items
sql/item.cc:
basic row Items
sql/item.h:
basic row Items
sql/item_cmpfunc.cc:
basic row Items
sql/item_cmpfunc.h:
basic row Items
sql/item_func.cc:
basic row Items
sql/item_func.h:
basic row Items
sql/item_strfunc.cc:
basic row Items
sql/item_strfunc.h:
basic row Items
sql/item_subselect.cc:
basic row Items
sql/item_sum.cc:
basic row Items
sql/share/czech/errmsg.txt:
more wide error mening
sql/share/danish/errmsg.txt:
more wide error mening
sql/share/dutch/errmsg.txt:
more wide error mening
sql/share/english/errmsg.txt:
more wide error mening
sql/share/estonian/errmsg.txt:
more wide error mening
sql/share/french/errmsg.txt:
more wide error mening
sql/share/german/errmsg.txt:
more wide error mening
sql/share/greek/errmsg.txt:
more wide error mening
sql/share/hungarian/errmsg.txt:
more wide error mening
sql/share/italian/errmsg.txt:
more wide error mening
sql/share/japanese/errmsg.txt:
more wide error mening
sql/share/korean/errmsg.txt:
more wide error mening
sql/share/norwegian-ny/errmsg.txt:
more wide error mening
sql/share/norwegian/errmsg.txt:
more wide error mening
sql/share/polish/errmsg.txt:
more wide error mening
sql/share/portuguese/errmsg.txt:
more wide error mening
sql/share/romanian/errmsg.txt:
more wide error mening
sql/share/russian/errmsg.txt:
more wide error mening
sql/share/serbian/errmsg.txt:
more wide error mening
sql/share/slovak/errmsg.txt:
more wide error mening
sql/share/spanish/errmsg.txt:
more wide error mening
sql/share/swedish/errmsg.txt:
more wide error mening
sql/share/ukrainian/errmsg.txt:
more wide error mening
sql/sql_base.cc:
fix_fields error handling
sql/sql_lex.cc:
basic row Items
sql/sql_select.cc:
basic row Items
sql/sql_yacc.yy:
basic row Items
into sanja.is.com.ua:/home/bell/mysql/work-in-4.1
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_lex.cc:
Merged
sql/sql_lex.h:
Merged
onversion with check
sql/item.cc:
removed similar code
sql/item_sum.cc:
conversion with check
sql/sql_delete.cc:
conversion with check
sql/sql_derived.cc:
style fix
sql/sql_lex.cc:
conversion with check
moved similar code to function
sql/sql_lex.h:
conversion with check
moved similar code to function
sql/sql_parse.cc:
conversion with check
sql/sql_update.cc:
conversion with check
sql/sql_yacc.yy:
conversion with check
mysql-test/r/subselect.result:
IN subselect with ORDER BY, HAVING & sum functions test
mysql-test/t/subselect.test:
IN subselect with ORDER BY, HAVING & sum functions test
sql/item.h:
removed field, because parent class has same field
fixed subselect error handling bug
fixed subselect UNION ALL bug
fixed thd->lex.select restoring
explain UNION subselect bug
mysql-test/r/subselect.result:
test for:
subselect UNION ALL bug
subselect error handling bug
explain UNION subselect bug
mysql-test/t/subselect.test:
test for:
subselect UNION ALL bug
subselect error handling bug
explain UNION subselect bug
sql/sql_lex.cc:
fixed subselect UNION ALL bug
sql/sql_lex.h:
fixed subselect UNION ALL bug
sql/sql_parse.cc:
fixed subselect UNION ALL bug
sql/sql_select.cc:
fixed subselect error handling bug
fixed explain UNION subselect bug
sql/sql_union.cc:
fixed thd->lex.select restoring
code cleanup
fixed subselect error handling bug
fixed subselect UNION ALL bug
sql/sql_yacc.yy:
fixed subselect UNION ALL bug
mysql-test/r/subselect.result:
update with subselect test
mysql-test/t/subselect.test:
update with subselect test
sql/mysql_priv.h:
fixed update with subselect
sql/sql_base.cc:
fixed update with subselect
sql/sql_lex.cc:
fixed update with subselect
sql/sql_select.cc:
fixed update with subselect
sql/sql_update.cc:
fixed update with subselect
sql/sql_yacc.yy:
fixed update with subselect
include/mysql_com.h:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/key_primary.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/r/odbc.result:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/r/varbinary.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.h:
Auto merged
