into mysql.com:/home/jimw/my/mysql-5.0-clean
BitKeeper/deleted/.del-not_windows.inc:
Delete: mysql-test/include/not_windows.inc
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl_flush_tables.test:
Auto merged
sql-common/my_time.c:
Auto merged
mysql-test/r/query_cache.result:
Resolve conflict
mysql-test/r/query_cache.result:
Updated results
mysql-test/t/query_cache.test:
Change test to use a truly invalid date, now that dates like
'20050327 0:0:0' are handled as they are in 4.0.
length.
When temporary field created for DATE(LEFT(column,8)) expression, max_length
value is taken from Item_date_typecast, and it is getting it from underlaid
Item_func_left and it's max_length is 8 in given expression. And all this
results in stripping last 2 digits.
To Item_date_typecast class added its own fix_length_and_dec() function
that sets max_length value to 10, which is proper for DATE field.
mysql-test/t/group_by.test:
Test case for bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced length.
mysql-test/r/group_by.result:
Test case for bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced length.
sql/item_timefunc.h:
Fix bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced length.
To Item_date_typecast class added its own fix_length_and_dec() which sets proper max_length value.
Back ported ndbcluster_support() from 5.0
Corrected the server id handling
mysql-test/mysql-test-run.pl:
Back ported ndbcluster_support() from 5.0
Corrected the server id handling
into deer.(none):/home/hf/work/mysql-5.0.clean
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
fixing tests accordingly
item.cc:
Bug #10892 user variables not auto cast for comparisons
When mixing strings with different character sets,
and coercibility is the same, we allow conversion
if one character set is superset for other character set.
sql/item.cc:
Bug #10892 user variables not auto cast for comparisons
When mixing strings with different character sets,
and coercibility is the same, we allow conversion
if one character set is superset for other character set.
mysql-test/t/grant.test:
fixing tests accordingly
mysql-test/r/grant.result:
fixing tests accordingly
that platform, not real failures. (Bug #12328, Bug #11569)
mysql-test/t/packet.test:
Skip this test on Windows
mysql-test/t/rpl_flush_tables.test:
Skip this test on Windows
mysql-test/include/not_windows.inc:
Add include for skipping tests on Windows
in the database directory on the master
mysql-test/r/rpl_drop_db.result:
New BitKeeper file ``mysql-test/r/rpl_drop_db.result''
mysql-test/t/rpl_drop_db.test:
New BitKeeper file ``mysql-test/t/rpl_drop_db.test''
Adds --replace_column to make test results deterministic.
mysql-test/r/rpl_slave_status.result:
BUG#12330 updated result file which I missed in last changeset
This updates the test to use --replace_column to make the test
deterministic.
Added check which throws ER_WRONG_OBJECT error in case the .frm
doesn't contain a valid table type (e.g. view or trigger)
mysql-test/r/create.result:
Added test case for bug #6859
mysql-test/t/create.test:
Add testcase for bug #6850
mysql-test/r/sp.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_trigger.h:
Auto merged
* Don't activate prelocking mode for evaluating procedure arguments when it is not necessary.
* Code structure simplification and cleanup.
* Cleanup in .test files
mysql-test/r/sp-prelocking.result:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/r/sp-security.result:
Don't drop the table we're not using.
mysql-test/r/sp.result:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
mysql-test/t/sp-prelocking.test:
Prelocking-free SPs, post-review fixes:
Added comment, s/testdb/mysqltest/, fixed a wrong test (error wasnt reported because of known bug in mysqltestrun)
mysql-test/t/sp-security.test:
Don't drop the table we're not using.
mysql-test/t/sp.test:
Prelocking-free SPs, post-review fixes:
remove redundant "drop table if exists t3" statements
sql/sp.cc:
New, better defined, sp_get_prelocking_info() function to get info about
statement prelocking options
sql/sp.h:
Prelocking-free SPs, post-review fixes: New, better defined, sp_get_prelocking_info()
function to get info about statement prelocking options
sql/sp_cache.h:
Prelocking-free SPs, post-review fixes: Amended the comments
sql/sp_head.cc:
Prelocking-free SPs, post-review fixes: Amend the comments, simplify the code that
attaches removes statement's prelocking tables.
sql/sql_base.cc:
Prelocking-free SPs, post-review fixes:
* Use a better defined sp_get_prelocking_info() function to get info about
statement prelocking options
* Don't activate prelocked mode for evaluation of SP arguments that use tables
but don't need prelocking.
sql/sql_class.cc:
Prelocking-free SPs, post-review fixes: Initialize THD members in the order they are declared.
into mysql.com:/home/jimw/my/mysql-5.0-clean
client/mysqltest.c:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
Resolve conflict
mysql-test/t/information_schema.test:
Stub out column in results that we don't care about, and may vary
mysql-test/r/information_schema.result:
Update results
that is outside the acceptable date range. (Bug #10627)
mysql-test/r/func_date_add.result:
Add new results
mysql-test/t/func_date_add.test:
Add new regression test
sql/item_timefunc.cc:
Add warning for error conditions in Item_date_add_interval::get_date()
sql/share/errmsg.txt:
Add new error message
Bug was introduced by cset 1.1659.14.1. Before it server was silently
ignoring that lock can't be acquired because it already acquired.
This patch makes make_global_read_lock_block_commit() return without error
if lock already acquired.
mysql-test/t/flush_table.test:
Test case for bug#11934 FLUSH TABLES WITH READ LOCK hangs client.
mysql-test/r/flush_table.result:
Test case for bug#11934 FLUSH TABLES WITH READ LOCK hangs client.
sql/lock.cc:
Fix bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs client.
Make make_global_read_lock_block_commit() return without error if lock already acquired.
frequently used command sequence replaced with inline function
BitKeeper/etc/config:
logging switching off
mysql-test/r/lowercase_view.result:
hided view underlying tables from error message
mysql-test/r/view.result:
hided view underlying tables from error message
mysql-test/t/lowercase_view.test:
hided view underlying tables from error message
mysql-test/t/view.test:
hided view underlying tables from error message
sql/mysql_priv.h:
subroutine which return correct error message
sql/share/errmsg.txt:
new error message
sql/sql_base.cc:
subroutine which issue correct error message in case of view presence for duplicated table on update
sql/sql_delete.cc:
issue correct error message in case of view presence for duplicated table on update
sql/sql_insert.cc:
issue correct error message in case of view presence for duplicated table on update
sql/sql_parse.cc:
issue correct error message in case of view presence for duplicated table on update
sql/sql_update.cc:
issue correct error message in case of view presence for duplicated table on update
sql/sql_view.cc:
frequently used command sequence replaced with inline function
sql/table.cc:
frequently used command sequence replaced with inline function
sql/table.h:
frequently used command sequence replaced with inline function
myisam/sort.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
date format. (Bug #7308)
mysql-test/r/type_datetime.result:
Add new results
mysql-test/t/type_datetime.test:
Add new test
sql-common/my_time.c:
Fix handling of field_length for each field in date, especially
for dates not in the internal_format.
FULLTEXT non-functional for big5 strings
mysql-test/r/ctype_big5.result:
Test case for BUG#12075.
mysql-test/t/ctype_big5.test:
Test case for BUG#12075.
strings/ctype-big5.c:
hack: (to be fixed properly later) all multi-byte sequences are considered isalpha() now
Repair crashes mysql when table has fulltext index.
myisam/sort.c:
Use static ft_buf instead of dynamic mergebuf. Latter could be NULL if record has long words.
mysql-test/r/fulltext.result:
Test case for BUG#11684 - repair crashes mysql when table has fulltext index.
mysql-test/t/fulltext.test:
Test case for BUG#11684 - repair crashes mysql when table has fulltext index.
