(BUG#1638)
mysql-test/r/subselect.result:
test for BUG#1638
mysql-test/t/subselect.test:
test for BUG#1638
sql/item_subselect.cc:
always check cardinality first
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_parse.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.cc:
used variable to avoid using prev_unit->item which should be more clean
sql/item_subselect.cc:
uncachable tested on fix fields and correct bits set
libmysqld/lib_sql.cc:
This code seems to be superfluous
sql/derror.cc:
in embedded server these functions should return the sign of the error
instead of halting the program
sql/init.cc:
my_abort_hook left unchanged
sql/mysql_priv.h:
declaration of init_errmessage changed
unireg_abort was replaced with DBUG_RETURN for embedded server
sql/mysqld.cc:
these functions don't work in embedded server thus #ifdef-ed
BitKeeper/etc/ignore:
auto-union
include/m_ctype.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
strings/ctype-simple.c:
Auto merged
http://bugs.mysql.com/bug.php?id=1022
Description: When a table contains a 'float' field, and one of the functions
MAX, MIN, or AVG is used on that field, the system crashes.
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/lex.h:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
- correct table name shown in EXPLAIN Iindex reference)
- pointer on freed memmory (reallocation of table name in reusing table entry) can't be used in EXPLAIN
(BUG#1584)
mysql-test/r/derived.result:
test moved to derived table tests
added test of BUG#1584
mysql-test/r/subselect.result:
test moved to derived table tests
mysql-test/t/derived.test:
test moved to derived table tests
added test of BUG#1584
mysql-test/t/subselect.test:
test moved to derived table tests
sql/item.cc:
layout fix
sql/sql_select.cc:
correct table name assigned to temporary table field
mysql-test/r/subselect.result:
fixed drop table statement
test for BUG#1536
mysql-test/t/subselect.test:
fixed drop table statement
test for BUG#1536
sql/sql_derived.cc:
all tree of derived table should be deleted
sql/sql_lex.cc:
delete subtree method
sql/sql_lex.h:
delete subtree method
(BUG#1444)
mysql-test/r/subselect.result:
BUG#1444 test
mysql-test/t/subselect.test:
BUG#1444 test
sql/item.cc:
storing used tables in Item_subselect
sql/item_subselect.cc:
fixed support of used_tables() and const_item() in subqueries
sql/item_subselect.h:
fixed support of used_tables() and const_item() in subqueries
include/mysqld_error.h:
added error "Incorrect index name"
mysql-test/r/create.result:
added test for empty index name
mysql-test/t/create.test:
added test for empty index name
sql/share/czech/errmsg.txt:
added error "Incorrect index name"
sql/share/danish/errmsg.txt:
added error "Incorrect index name"
sql/share/dutch/errmsg.txt:
added error "Incorrect index name"
sql/share/english/errmsg.txt:
added error "Incorrect index name"
sql/share/estonian/errmsg.txt:
added error "Incorrect index name"
sql/share/french/errmsg.txt:
added error "Incorrect index name"
sql/share/german/errmsg.txt:
added error "Incorrect index name"
sql/share/greek/errmsg.txt:
added error "Incorrect index name"
sql/share/hungarian/errmsg.txt:
added error "Incorrect index name"
sql/share/italian/errmsg.txt:
added error "Incorrect index name"
sql/share/japanese/errmsg.txt:
added error "Incorrect index name"
sql/share/korean/errmsg.txt:
added error "Incorrect index name"
sql/share/norwegian-ny/errmsg.txt:
added error "Incorrect index name"
sql/share/norwegian/errmsg.txt:
added error "Incorrect index name"
sql/share/polish/errmsg.txt:
added error "Incorrect index name"
sql/share/portuguese/errmsg.txt:
added error "Incorrect index name"
sql/share/romanian/errmsg.txt:
added error "Incorrect index name"
sql/share/russian/errmsg.txt:
added error "Incorrect index name"
sql/share/serbian/errmsg.txt:
added error "Incorrect index name"
sql/share/slovak/errmsg.txt:
added error "Incorrect index name"
sql/share/spanish/errmsg.txt:
added error "Incorrect index name"
sql/share/swedish/errmsg.txt:
added error "Incorrect index name"
sql/share/ukrainian/errmsg.txt:
added error "Incorrect index name"
sql/sql_table.cc:
added checking for wrong index name
BitKeeper/deleted/.del-MYSQL.ICO~d93519b5f0d6ee1:
Auto merged
client/client_priv.h:
Auto merged
extra/resolveip.c:
Auto merged
include/mysql.h:
Auto merged
include/thr_alarm.h:
Auto merged
myisam/myisamchk.c:
Auto merged
scripts/mysql_config.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_test.cc:
Auto merged
into mashka.mysql.fi:/home/my/mysql-4.1
sql/item_strfunc.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
After merge fixes
include/my_base.h:
Fix comment syntax
libmysql/client_settings.h:
Portability fixes for windows
libmysql/libmysql.c:
Portability fixes for windows
libmysql/libmysql.def:
Portability fixes for windows
mysql-test/r/variables.result:
Fix result after merge
sql-common/client.c:
Portability fixes for windows
sql/ha_berkeley.cc:
Use defines instead of constants
sql/item_strfunc.cc:
Portability fixes for windows
sql/mysql_priv.h:
Use defines instead of defines
sql/mysqld.cc:
After merge fix
sql/opt_range.h:
After merge fix
sql/set_var.h:
Portability fixes for windows
sql/sql_class.cc:
Defines instead of constants
sql/sql_help.cc:
after merge fixes
More OOM error checking
sql/sql_prepare.cc:
After merge fixes
sql/sql_table.cc:
Portability fixes for windows
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)
include/mysql.h:
Added client timeouts (for TCP/IP)
libmysql/libmysql.c:
Added client timeouts (for TCP/IP)
mysql-test/r/create.result:
More tests for CREATE TABLE IF NOT EXISTS ... SELECT
mysql-test/t/create.test:
More tests for CREATE TABLE IF NOT EXISTS ... SELECT
mysys/my_chsize.c:
Fix for windows
sql/handler.h:
Remove not used field 'if_not_exists'
Ordered fields to be more optimized for new CPU's
Added field 'table_existed'
sql/slave.cc:
Cleanup temporary tables when slave ends
sql/sql_class.h:
Remove not used 'do_not_drop' field
sql/sql_insert.cc:
Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
sql/sql_table.cc:
Better fix for CREATE TABLE IF NOT EXISTS ... SELECT
into mashka.mysql.fi:/home/my/mysql-4.0
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
