Fixed error messages
sql/share/czech/errmsg.txt:
Fixed error message to us long
sql/share/danish/errmsg.txt:
Fixed error message to us long
sql/share/dutch/errmsg.txt:
Fixed error message to us long
sql/share/english/errmsg.txt:
Fixed error message to us long
sql/share/estonian/errmsg.txt:
Fixed error message to us long
sql/share/french/errmsg.txt:
Fixed error message to us long
sql/share/german/errmsg.txt:
Fixed error message to us long
sql/share/greek/errmsg.txt:
Fixed error message to us long
sql/share/hungarian/errmsg.txt:
Fixed error message to us long
sql/share/italian/errmsg.txt:
Fixed error message to us long
sql/share/japanese/errmsg.txt:
Fixed error message to us long
sql/share/korean/errmsg.txt:
Fixed error message to us long
sql/share/norwegian-ny/errmsg.txt:
Fixed error message to us long
sql/share/norwegian/errmsg.txt:
Fixed error message to us long
sql/share/polish/errmsg.txt:
Fixed error message to us long
sql/share/portuguese/errmsg.txt:
Fixed error message to us long
sql/share/romanian/errmsg.txt:
Fixed error message to us long
sql/share/russian/errmsg.txt:
Fixed error message to us long
sql/share/serbian/errmsg.txt:
Fixed error message to us long
sql/share/slovak/errmsg.txt:
Fixed error message to us long
sql/share/spanish/errmsg.txt:
Fixed error message to us long
sql/share/swedish/errmsg.txt:
Fixed error message to us long
sql/share/ukrainian/errmsg.txt:
Fixed error message to us long
sql/sql_table.cc:
Fixed uninitialized variable
allowed parsing of table fields inside aggregate functions
added new tests of fields resolving in grouping
mysql-test/r/func_gconcat.result:
allowed parsing of table fields inside aggregate functions
mysql-test/r/subselect.result:
added new tests of fields resolving in grouping
mysql-test/t/func_gconcat.test:
allowed parsing of table fields inside aggregate functions
mysql-test/t/subselect.test:
added new tests of fields resolving in grouping
sql/item_subselect.cc:
allowed parsing of table fields inside aggregate functions
with the sleep value we use for the test suite run during the
release builds
BitKeeper/deleted/.del-flush_block_commit-master.opt~3bcd295d5bf68796:
Delete: mysql-test/t/flush_block_commit-master.opt
mysql-test/r/binary.result:
Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results
mysql-test/t/binary.test:
Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results
sql/sql_select.cc:
Fix for bug #5134: WHERE x = 'bar' AND x LIKE BINARY 'bar' returns wrong results
Don't do this test for now: it fails on Mac OSX.
mysql-test/r/show_check.result:
Don't do this test for now: it fails on Mac OSX.
mysql-test/t/show_check.test:
Don't do this test for now: it fails on Mac OSX.
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
fix for bdb not ending up into libmysqld.a
bdb/dist/configure.ac:
bdb bugfix: LTLIBOBJS didn't take --disable-shared into account
configure.in:
build bdb with --disable-shared for libdb.a to go into libmysqld.a
libmysqld/examples/Makefile.am:
incorrect "bugfix" undone. bdb should be in libmysqld.a
* When executing EXPLAIN, do the same as for the query: convert join type to JT_CONST if keyuse array covers all key parts and all of them are constants.
* In remove_const, don't remove conditions that depend on some-const-table and current-table.
mysql-test/r/join_outer.result:
Testcase for bug#5088
mysql-test/t/join_outer.test:
Testcase for bug#5088
Added test case for bug #4256.
join_outer.result:
Fixed bug #4256.
item_cmpfunc.h:
Fixed inconsistency of values of used_tables_cache and
const_item_cache for Item_func_isnull objects.
This inconsistency caused bug #4256.
sql/item_cmpfunc.h:
Fixed inconsistency of values of used_tables_cache and
const_item_cache for Item_func_isnull objects.
This inconsistency caused bug #4256.
mysql-test/r/join_outer.result:
Fixed bug #4256.
mysql-test/r/null.result:
Added test case for bug #4256.
mysql-test/t/null.test:
Added test case for bug #4256.
into mysql.com:/home/kostja/work/mysql-4.1-4912
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
a second time". The bug was caused by incompatibility of
negations elimination algorithm and PS: during first statement
execute a subtree with negation was replaced with equivalent
subtree without NOTs.
The problem was that although this transformation was permanent,
items of the new subtree were created in execute-local memory.
The patch adds means to check if it is the first execute of a
prepared statement, and if this is the case, to allocate items
in memory of the prepared statement.
The implementation:
- backports Item_arena from 5.0
- adds Item_arena::is_stmt_prepare(),
Item_arena::is_first_stmt_execute().
- deletes THD::allocate_temporary_pool_for_ps_preparing(),
THD::free_temporary_pool_for_ps_preparing(); they
were redundant.
and adds a few invariants:
- thd->free_list never contains junk (= freed items)
- thd->current_arena is never null. If there is no
prepared statement, it points at the thd.
The rest of the patch contains mainly mechanical changes and
cleanups.
mysql-test/r/ps.result:
Test results updated (test case for Bug#4912)
mysql-test/t/ps.test:
A test case for Bug#4912 "mysqld crashs in case a statement is
executed a second time"
sql/item_cmpfunc.cc:
current_statement -> current_arena
sql/item_subselect.cc:
Statement -> Item_arena, current_statement -> current_arena
sql/item_subselect.h:
Item_subselect does not need to save thd->current_statement.
sql/item_sum.cc:
Statement -> Item_arena
sql/item_sum.h:
Statement -> Item_arena
sql/mysql_priv.h:
Statement -> Item_arena
sql/sql_base.cc:
current_statement -> current_arena
sql/sql_class.cc:
- Item_arena
- convenient set_n_backup_statement, restore_backup_statement
(nice idea, Sanja)
sql/sql_class.h:
- Item_arena: backport from 5.0
- allocate_temporary_pool_for_ps_preparing,
free_temporary_pool_for_ps_preparing removed.
sql/sql_derived.cc:
current_statement -> current_arena
sql/sql_lex.cc:
current_statement -> current_arena
sql/sql_parse.cc:
Deploy invariant that thd->free_list never contains junk items
(backport from 5.0).
sql/sql_prepare.cc:
- backporting Item_arena
- no need to allocate_temporary_pool_for_ps_preparing().
sql/sql_select.cc:
Fix for bug#4912 "mysqld crashs in case a statement is
executed a second time": if this is the first execute of
a prepared statement, negation elimination is
done in memory of the prepared statement.
sql/sql_union.cc:
Backporting Item_arena from 5.0.
Fixed it to work, added function to fix include/mysql_version.h LICENSE tag from GPL to Commercial
Build-tools/mysql-copyright:
Fixed it to work, added function to fix include/mysql_version.h LICENSE tag from GPL to Commercial
