into mysql.com:/usr/home/ram/work/5.0.b12956
mysql-test/r/ps.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/func_equal.result:
Auto merged
mysql-test/t/func_equal.test:
Auto merged
sql/item_cmpfunc.cc:
SCCS merged
mysql-test/r/bdb.result:
Add new results
mysql-test/r/innodb.result:
Add new results
mysql-test/t/bdb.test:
Add simple test that large keys are allowed
mysql-test/t/innodb.test:
Add simple test that large keys are allowed
sql/unireg.h:
Allow key length of 3K even on 32-bit platforms
sql/sp_head.cc:
Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
- call thd->cleanup_after_query() to clean next_insert_id.
sql/sql_class.cc:
Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
- save/restore clear_next_insert_id
sql/sql_class.h:
Fix for bug #14304: auto_increment field incorrect set from within stored procedure (insert select).
- clear_next_insert_id added
into mysql.com:/home/timka/mysql/src/5.0-bug-14920
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/group_min_max.result:
Manually merged test cases.
mysql-test/t/group_min_max.test:
Manually merged test cases.
store TABLES.TABLE_TYPE in case of error during table opening
mysql-test/r/information_schema.result:
Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
test case
mysql-test/t/information_schema.test:
Fix for bug#14476 `information_schema`.`TABLES`.`TABLE_TYPE` with empty value
test case
Commented out one failing query in the regression test (reported as a bug).
mysql-test/r/join.result:
Commented out failing query.
mysql-test/t/join.test:
Commented out failing query.
Implemented specialized regression test for the WL.
mysql-test/r/join.result:
Test results for natural join tests.
mysql-test/t/join.test:
Specialized test for natural join, and join ... on.
The cause of the bug was the use of end_write_group instead of end_write
in the case when ORDER BY required a temporary table, which didn't take
into account the fact that loose index scan already computes the result
of MIN/MAX aggregate functions (and performs grouping).
The solution is to call end_write instead of end_write_group and to add
the MIN/MAX functions to the list of regular functions so that their
values are inserted into the temporary table.
mysql-test/r/group_min_max.result:
Test for BUG#14920
mysql-test/t/group_min_max.test:
Test for BUG#14920
sql/sql_class.cc:
Added new member to TMP_TABLE_PARAM.
sql/sql_class.h:
Added new member to TMP_TABLE_PARAM.
sql/sql_select.cc:
Enable result rows generated by loose index scan being written into
a temporary table. The change is necessary because loose index
scan already computes the result of GROUP BY and the MIN/MAX aggregate
functions. This is realized by three changes:
- create_tmp_table allocates space for aggregate functions in the
list of regular functions,
- use end_write instead of end_write group,
- copy the pointers to the MIN/MAX aggregate functions to the list
of regular functions TMP_TABLE_PARAM::items_to_copy.
sql/sql_select.h:
New parameter to create_tmp_table.
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/union.result:
Auto merged
sql/item.cc:
Auto merged
vio/viosslfactories.c:
Auto merged
mysql-test/t/union.test:
Resolve conflict
Removed warnings that depends on floating point comparisions in type_newdecimal.test which caused failures in some setups
[Backported from mysql-5.1-new @1.1961.1.1]
mysql-test/r/type_newdecimal.result:
Moved long running query to type_newdecimal-big.test
Removed warnings that depends on floating point comparisions
[Backported from mysql-5.1-new]
mysql-test/t/type_newdecimal.test:
Moved long running query to type_newdecimal-big.test
Removed warnings that depends on floating point comparisions
[Backported from mysql-5.1-new]
into mysql.com:/usr/home/bar/mysql-5.0
mysql-test/r/ctype_recoding.result:
Auto merged
sql/item.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/t/create.test:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/create.result:
Resolve conflict
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
myisam/ft_parser.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
earlier because of various features/checks missing (these features/checks
are now implemented).
mysql-test/r/sp.result:
Enabled back bunch of tests which were previously disabled because of various
features/checks missing (since these features/checks are now implemented).
mysql-test/t/sp.test:
Enabled back bunch of tests which were previously disabled because of various
features/checks missing (since these features/checks are now implemented).
A typo bug caused loss of a predicate of the form field=const in some cases.
mysql-test/r/select.result:
Added a test case for bug #15106.
mysql-test/t/select.test:
Added a test case for bug #15106.
CREATE TABLE and PS/SP": make sure that 'typelib' object for
ENUM values and 'Item_string' object for DEFAULT clause are
created in the statement memory root.
mysql-test/r/ps.result:
Test results has been fixed (Bug#14410)
mysql-test/t/ps.test:
A test case for Bug#14410 "Crash in Enum or Set type in CREATE
TABLE and PS/SP"
sql/mysql_priv.h:
typelib() function declaration has been changed.
sql/sql_table.cc:
Supply the statement memory root to use in typelib() and
safe_charset_converter() functions to ensure that objects
created during the first execution of CREATE TABLE statement
are allocated in persistent memory of the statement.
sql/table.cc:
Change typelib() function to require MEM_ROOT.
