into neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/innodb-deadlock.test:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/ndb_autodiscover2.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl_EE_error.test:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
mysql-test/t/rpl_drop.test:
Auto merged
mysql-test/t/rpl_drop_temp.test:
Auto merged
mysql-test/t/rpl_error_ignored_table.test:
Auto merged
mysql-test/t/rpl_flush_log_loop.test:
Auto merged
mysql-test/t/rpl_insert_id.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_until.test:
Auto merged
client/mysqltest.c:
Manual merge
mysql-test/t/mysqltest.test:
Manual merge
into mysql.com:/home/dlenev/src/mysql-4.1-bg12423
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/r/grant2.result:
Manual merge.
mysql-test/t/grant2.test:
Manual merge.
multi-threaded environment".
To avoid deadlocks between several simultaneously run account management
commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
commands) we should always take table and internal locks during their
execution in the same order. In other words we should first open and lock
privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.
mysql-test/r/grant2.result:
Added test for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in
multi-threaded environment".
mysql-test/t/grant2.test:
Added test for bug #12423 "Deadlock when doing FLUSH PRIVILEGES and GRANT in
multi-threaded environment".
sql/mysqld.cc:
acl_init/grant_init() are now used only at server start up so they always
allocate temporary THD object and don't need argument for passing pointer
to it.
sql/sql_acl.cc:
To avoid deadlocks between several simultaneously run account management
commands (particularly between FLUSH PRIVILEGES/SET PASSWORD and GRANT
commands) we should always take table and internal locks during their
execution in the same order. In other words we should first open and lock
privilege tables and only then obtain acl_cache::lock/LOCK_grant locks.
Changed acl_reload()/grant_reload() and change_password()/update_user_table()
in such way that they obey this principle. Now in acl_reload()/grant_reload()/
change_password() we open and lock privilege tables, then obtain internal
locks and then call acl_load()/grant_load()/update_user_table() functions to
do actual loading or updating.
sql/sql_acl.h:
acl_init/grant_init() are now used only at server start up so they always
allocate temporary THD object and don't need argument for passing pointer
to it. acl_reload()/grant_reload() now are able to report about their
success or failure through return value.
sql/sql_parse.cc:
If reload_acl_and_cache() is called from SIGHUP handler we have to
allocate temporary THD for execution of acl_reload()/grant_reload().
Make sure mtr_kill_processes() is called with an array ref
Corrected error string for STDERR redirect
mysql-test/lib/mtr_process.pl:
Make sure mtr_kill_processes() is called with an array ref
client/mysqltest.c:
Fix function var_copy to make it possible to assign one variable to another.
ex: let $1=$2
mysql-test/r/mysqltest.result:
Update test result
mysql-test/t/mysqltest.test:
Add test cases for variable to variable assignment
- Move clearing of expected errors
client/mysqltest.c:
Move clear of expected errors to the query loop so that the expected error is reset even when the query is retrieved from the q_lines cache.
mysql-test/r/mysqltest.result:
Update test results
mysql-test/t/mysqltest.test:
Add test for bug#12471
on Windows. (Bug #12325)
mysql-test/r/lowercase_table.result:
Update results
mysql-test/t/lowercase_table.test:
Move test to new windows.test, since it is Windows-specific
mysys/my_access.c:
Check that we've matched the whole forbidden name.
mysql-test/include/windows.inc:
New BitKeeper file ``mysql-test/include/windows.inc''
mysql-test/r/windows.result:
New BitKeeper file ``mysql-test/r/windows.result''
mysql-test/t/windows.test:
New BitKeeper file ``mysql-test/t/windows.test''
Use !<err_no> instead
client/mysqltest.c:
Remove syntax !$<err_no> to set an expected error code
mysql-test/r/mysqltest.result:
Update test result
mysql-test/t/mysqltest.test:
Uncomment tests for the deprecated syntax
rpl_replicate_do.result:
New test case
sql_parse.cc:
All SET statements should be executed by slave thd
rpl_replicate_do.test:
New test case
mysql-test/t/rpl_replicate_do.test:
Added test
sql/sql_parse.cc:
All SET commands should be executed by slave thd
mysql-test/r/rpl_replicate_do.result:
New test case
- Add stricter checking of syntax in mysqltest
client/mysqltest.c:
Stricter checking of syntax in mysqltest.
mysql-test/r/mysqltest.result:
Update test results
mysql-test/t/create.test:
Remove extra ;
mysql-test/t/create_select_tmp.test:
Remove extra ;
mysql-test/t/drop.test:
Remove extra ;
mysql-test/t/flush.test:
Remove extra ;
mysql-test/t/handler.test:
Remove extra ;
mysql-test/t/innodb.test:
Remove extra ;
mysql-test/t/mysqltest.test:
Add more tests for replace, replace_columns, comments with commands and sync_with_master
mysql-test/t/rpl000001.test:
Remove extra ;
mysql-test/t/rpl_EE_error.test:
Remove extra ;
mysql-test/t/rpl_drop.test:
Remove extra ;
mysql-test/t/rpl_error_ignored_table.test:
Remove extra ;
mysql-test/t/rpl_loaddata.test:
Remove extra ;
Backporting from 5.0
mysql-test/mysql-test-run.pl:
Backporting from 5.0
mysql-test/lib/mtr_process.pl:
Backporting from 5.0
mysql-test/lib/mtr_report.pl:
Backporting from 5.0
mysql-test/lib/mtr_timer.pl:
Backporting from 5.0
Item_func_group_concat::fix_fields() set maybe_null flag to 0, and set it to
1 only if some of it's arguments may be null. When used in subquery in tmp
table created field which can't be null. When no data retireved result field
have to be set to null and error mentioned in bug report occurs. Also this
bug can occur if selecting from not null field in empty table.
Function group_concat now marked maybe_null from the very beginning not only
if some of it's argument may be null.
sql/item_sum.cc:
Fix bug #12861 client hang with group_concat insubquery FROM DUAL.
mysql-test/r/func_gconcat.result:
Test case for bug #12861 client hang with group_concat insubquery FROM DUAL.
mysql-test/t/func_gconcat.test:
Test case for bug #12861 client hang with group_concat insubquery FROM DUAL.
item_cmpfunc.cc:
Pass unicode value as "escape" argument to my_wildcmp
if a multibyte character set is used.
For single byte character set nothing has changed:
native (non-unicode) character code is still passed.
ctype_utf8.result, ctype_utf8.test:
adding test case
sql/item_cmpfunc.cc:
Bug#12611: ESCAPE + LIKE do not work when the escape char is a multibyte one
Pass unicode code instead of native code as
"escape" argument to my_wildcmp.
mysql-test/t/ctype_utf8.test:
adding test
mysql-test/r/ctype_utf8.result:
adding test
closing temp tables in thread cleanup.
mysql-test/r/connect.result:
added results for test of bug #12517
mysql-test/t/connect.test:
added test of bug #12517
sql/sql_class.cc:
Clear user variables and replication events before
closing temp tables in thread cleanup.
Item::tmp_table_field_from_field_type() and create_tmp_field_from_item()
was converting string field to blob depending on byte-wise length instead of
character length, which results in converting valid varchar string with
length == 86 to longtext.
Made that functions above take into account max width of character when
converting string fields to blobs.
sql/item.cc:
Fix bug #12537 UNION produces longtext instead of varchar
Item::tmp_table_field_from_field_type() now taking into account max char width when creating tmp field for string fields.
sql/sql_select.cc:
Fix bug #12537 UNION produces longtext instead of varchar
create_tmp_field_from_item()now taking into account max char width when creating tmp field for string fields.
mysql-test/r/create.result:
Test case for bug #12537 UNION produces longtext instead of varchar
mysql-test/t/create.test:
Test case for bug #12537 UNION produces longtext instead of varchar
character_set_results is nullable, but value_ptr returns string "NULL"
set_var.cc:
Create Item_null instead of Item_string for NULL values
variables.result, variables.test:
adding test case
sql/set_var.cc:
Bug#12363
character_set_results is nullable, but value_ptr returns string "NULL"
Create Item_null instead of Item_string for NULL values
mysql-test/t/variables.test:
fixing tests accordingly
mysql-test/r/variables.result:
fixing tests accordingly
Cannot convert the charset of a GROUP_CONCAT result:
item_sum.cc:
"result" character set was not set into proper value.
func_gconcat.result, func_gconcat.test:
Fixing tests accordingly.
sql/item_sum.cc:
Bug #12829
Cannot convert the charset of a GROUP_CONCAT result:
"result" character set was not set into proper value.
mysql-test/t/func_gconcat.test:
Bug #12829
mysql-test/r/func_gconcat.result:
Bug #12829
mysql-test/r/archive.result:
Update for test case to make sure that TRUNCATE and DELETE function(hah!) as designed.
mysql-test/t/archive.test:
Add TRUNCATE and DELETE support.
sql/examples/ha_archive.cc:
Added delete_all_rows() support.
sql/examples/ha_archive.h:
Added delete_all_rows() support.
sql/handler.h:
Added flags for fast delete support for archive and federated.
Skipping deleted records instead of breaking the loop
during checksum calculation.
mysql-test/r/myisam.result:
Bug#12296 - CHECKSUM TABLE reports 0 for the table
The test result.
mysql-test/t/myisam.test:
Bug#12296 - CHECKSUM TABLE reports 0 for the table
The test case.
Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.
mysql-test/r/innodb.result:
Bug#11816 - Truncate table doesn't work with temporary innodb tables
The test result.
mysql-test/t/innodb.test:
Bug#11816 - Truncate table doesn't work with temporary innodb tables
The test case.
sql/sql_delete.cc:
Bug#11816 - Truncate table doesn't work with temporary innodb tables
Handle temporary tables like permanent tables: If the storage engine
cannot truncate, delete instead.
Replaced a numeric literal by its symbolic name.
Supplied the default database name for ALTER TABLE ... RENAME
for the new table instead of the old tables db like we do for
other ALTERs.
mysql-test/r/alter_table.result:
Bug#11493 - Alter table rename to default database does not work without db name qualifying
The test result.
mysql-test/t/alter_table.test:
Bug#11493 - Alter table rename to default database does not work without db name qualifying
The test case.
Changed end-space comparison so that the key is not used past
its end. This is due to the new end-space behaviour in 4.1.
See also bug 6151 and 9188.
mysql-test/r/key.result:
Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
The test result.
mysql-test/t/key.test:
Bug#12565 - ERROR 1034 when running simple UPDATE or DELETE on large MyISAM table
The test case.
mysql-test/r/ctype_cp932.result:
Remove first event to make things portable
mysql-test/r/rpl_drop_db.result:
Use 'mysqltest' as database instead of 'd1'
Made test faster by using longer table names instead of lots of tables
mysql-test/t/ctype_cp932.test:
Remove first event to make things portable
mysql-test/t/rpl_drop_db.test:
Use 'mysqltest' as database instead of 'd1'
Made test faster by using longer table names instead of lots of tables
sql/sql_db.cc:
Indentation & style fixes
Simple optimization (remove constant and boolean variable)
Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
mysql-test/r/subselect2.result:
Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
user to update with 'SET PASSWORD = ...'. (Bug #12302)
mysql-test/r/grant2.result:
Add new results
mysql-test/t/grant2.test:
Add new tests
sql/set_var.cc:
Pass priv_host into check_change_password().
sql/sql_acl.cc:
Add exact flag for find_acl_user, so we can specify that we want
an exact match on the hostname.
mysql-test/r/ctype_cp932.result:
Update results to make them deterministic
mysql-test/t/ctype_cp932.test:
Updated test to be deterministic on all machines
include/my_sys.h:
Fixes from review (use version in log_event.cc instead)
mysql-test/r/ctype_cp932.result:
Updated test for bug#11338 (logging of prepared statement w/ blob type)
mysql-test/t/ctype_cp932.test:
udpated test for bug#11338 (logging of prepared statement w/ blob type)
mysys/charset.c:
Fixes from review (use version in log_event.cc instead)
sql/item.cc:
Fixes from review (store character_set_client differently so that
fix can be merged forward to 5.0)
sql/item.h:
Fixes from review
sql/log_event.cc:
Fixes from review, str_to_hex is now used by item.cc
sql/log_event.h:
Added prototype for str_to_hex (now used by item.cc)
sql/sql_prepare.cc:
Fixes from review, store character_set_client differently so that
Item_param::query_val_str can use it.
Added test cases for bug #12625.
sql_select.cc:
Fixed bug #12625.
Fixed invalid removal of constant items from the DISTINCT
list in the function create_distinct_group.
sql/sql_select.cc:
Fixed bug #12625.
mysql-test/r/distinct.result:
Added test cases for bug #12625.
mysql-test/t/distinct.test:
Added test cases for bug #12625.
into eel.(none):/home/jonas/src/mysql-4.1
mysql-test/t/ndb_config.test:
Auto merged
ndb/tools/Makefile.am:
Auto merged
ndb/tools/ndb_config.cpp:
Auto merged
rename config.cpp -> ndb_config.cpp for case insesitive filesystems
why wasn't this done in 4.1 directly
ndb/tools/ndb_config.cpp:
Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
mysql-test/t/ndb_config.test:
remove include only present in 5.0
ndb/tools/Makefile.am:
rename config.cpp -> ndb_config.cpp for case insesitive filesystems
why wasn't this done in 4.1 directly
We binlog the DROP TABLE for each table that was actually dropped. Per Sergei's
suggestion a fixed buffer for the DROP TABLE query is pre-allocated from THD pool, and
logging now is done in batches - new batch is started if the buffer becomes full.
Reduced memory usage by reusing the table list instead of accumulating a list of
dropped table names. Also fixed the problem if the table was not actually dropped, eg
due to permissions. Extended the test case to make sure batched query
logging does work.
mysql-test/r/rpl_drop_db.result:
test for query buffer overrun
mysql-test/t/rpl_drop_db.test:
test for query buffer overrun
sql/mysql_priv.h:
updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
BitKeeper/etc/ignore:
Added support-files/MacOSX/postflight support-files/MacOSX/preflight to the ignore list
sql/sql_db.cc:
updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
sql/sql_table.cc:
updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
sql/table.h:
updated patch for BUG#4680 (incomplete DROP DATABASE breaking replication)
Adjustment of float results for Windows
mysql-test-run.pl:
Added --port to make MYSQL_DUMP and MYSQL_SHOW work on windows
have_lowercase0.inc:
new file
mysql-test/mysql-test-run.pl:
Added --port to make MYSQL_DUMP and MYSQL_SHOW work on windows
mysql-test/include/ps_conv.inc:
Adjustment of float results for Windows
into eel.(none):/home/jonas/src/mysql-4.1-push
mysql-test/t/ndb_config.test:
Auto merged
ndb/src/common/util/version.c:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
mysql-test/t/ndb_alter_table.test:
merge
Split table version into 2 (major, minor)
Impl. signaling to API when table has been altered
Allow running transactions to use any minor number for transactions
mysql-test/r/ndb_alter_table.result:
Allow running transactions to use old table definition when possible.
mysql-test/t/ndb_alter_table.test:
Allow running transactions to use old table definition when possible.
ndb/include/kernel/BlockNumbers.h:
remove GREP
ndb/include/kernel/GlobalSignalNumbers.h:
Add ALTER_TABL_REP and API_BROADCAST_REP
ndb/include/kernel/kernel_types.h:
table_version_major
ndb/include/kernel/signaldata/AlterTable.hpp:
New error code for alter table during rolling upgrade
ndb/include/ndbapi/NdbDictionary.hpp:
Add state on table object to represent an altered but still valid table object
ndb/src/common/debugger/BlockNames.cpp:
remove GREP
ndb/src/common/util/version.c:
Fix upgrades
ndb/src/kernel/SimBlockList.cpp:
remove GREP
ndb/src/kernel/blocks/Makefile.am:
remove GREP
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
remove GREP
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Split tableSchemaVersion into 2 part
24 bit real version
8 bit for online alter table where old table definition is still usable
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Check for same ndb versions
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
Update schema printer
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
remove grep
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
1) Use table_ version_major when checking table version
2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
1) Use table_ version_major when checking table version
2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
1) Use table_ version_major when checking table version
2) Dummy fix for BUG that tableSchemaVersion is only 16 bit in LQHKEYREQ
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
remove GREP
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Add support for sending REP to ALL api nodes
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Add support for sending REP to ALL api nodes
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Add support for sending REP to ALL api nodes
ndb/src/kernel/blocks/suma/Suma.cpp:
remove GREP
ndb/src/mgmsrv/MgmtSrvr.cpp:
remove GREP
ndb/src/ndbapi/DictCache.cpp:
Add support for alter_table_rep
by setting status to Altered
NOTE special handling of tables in state RETREIVING
ndb/src/ndbapi/DictCache.hpp:
Add support for alter_table_rep
by setting status to Altered
NOTE special handling of tables in state RETREIVING
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Change alter table so that remove from global cache is used wo/ retreiving it from there first
as ALTER_TABLE_REP might already have changed the table object...
ndb/src/ndbapi/TransporterFacade.cpp:
Add support for ALTER_TABLE_REP
sql/ha_ndbcluster.cc:
Allow running transactions to use tables in state ALTERED...but new transactions may not...
ndb/include/kernel/signaldata/ApiBroadcast.hpp:
New BitKeeper file ``ndb/include/kernel/signaldata/ApiBroadcast.hpp''
Added suite and test case timeout
mtr_timer.pl:
new file
mysql-test/lib/mtr_process.pl:
Added suite and test case timeout
mysql-test/lib/mtr_report.pl:
Added suite and test case timeout
mysql-test/mysql-test-run.pl:
Added suite and test case timeout
mysql-test/lib/mtr_timer.pl:
Added suite and test case timeout
Longer shutdown timeout, slave may be in reconnect
HUP seem to disturb exit(), added sleep to make sure
output is flushed
mysql-test/lib/mtr_process.pl:
Longer shutdown timeout, slave may be in reconnect
HUP seem to disturb exit(), added sleep to make sure
output is flushed
Bug#12615: Host name might not resolve, use short host name
mysql-test/lib/mtr_misc.pl:
Bug#12615: Host name might not resolve, use short host name
mysql-test/mysql-test-run.pl:
Bug#12615: Host name might not resolve, use short host name
Bug#11884: Corrected --start-and-exit, start the server
as if the default/specified test case would have been run
mysql-test/mysql-test-run.pl:
Bug#11884: Corrected --start-and-exit, start the server
as if the default/specified test case would have been run
Bug#11792: Check all of status code, to catch a crash as a failure
mtr_cases.pl:
Code cleanup for skipped/disabled handling
mtr_process.pl:
In debug mode, report if mysqladmin did not at least
make the server stop listening to the port.
Increased the time waiting for terminating to 20 seconds,
to wait for really slow slave shutdown.
Added call to start_reap_all(), to avoid zombies.
mtr_report.pl:
Removed prototype for unused function mtr_report_test_disabled()
mysql-test/lib/mtr_report.pl:
Removed prototype for unused function mtr_report_test_disabled()
mysql-test/lib/mtr_cases.pl:
Code cleanup for skipped/disabled handling
mysql-test/lib/mtr_process.pl:
Bug#11792: Check all of status code, to catch a crash as a failure
Bug#12094: Let sleep_until_file_created() return the pid as intended
mysql-test/lib/mtr_process.pl:
Bug#12094: Let sleep_until_file_created() return the pid as intended
client/mysqltest.c:
Don't open a sourced file more than once as it will already have been read into the q_lines cache
mysql-test/r/mysqltest.result:
Added tests for source command inside of while loop
mysql-test/t/mysqltest.test:
Added tests for source command inside of while loop
Fixed bug #11479.
The JOIN::reinit method cannot call setup_tables
after the optimization phase since this function
removes some optimization settings for joined
tables. E.g. it resets values of the null_row flag to 0.
subselect.result, subselect.test:
Added a test case for bug #11479.
mysql-test/t/subselect.test:
Added a test case for bug #11479.
mysql-test/r/subselect.result:
Added a test case for bug #11479.
sql/sql_select.cc:
Fixed bug #11479.
The JOIN::reinit method cannot call setup_tables
after the optimization phase since this function
removes some optimization settings for joined
tables. E.g. it resets values of the null_row flag to 0.
mysql-test/r/subselect.result:
testst of IN subqueries with row
mysql-test/t/subselect.test:
tests of ion subqueries with row
sql/item.h:
add method to prevent of removing Item_ref_null_helper from HAVING
sql/item_cmpfunc.h:
Prevented removing of Item_test_isnotnull from HAVING
sql/item_subselect.cc:
fixed converting row IN subqueries
sql/sql_select.cc:
fixed debug print
query that mixed statements that do and do not return info. (Bug #11688)
mysql-test/r/metadata.result:
Add new results
mysql-test/t/metadata.test:
Add new regression test
sql-common/client.c:
Clear mysql->info in free_old_query()
sql/sql_cache.cc:
block QC using if tables are locked with LOCK
unlock QC
mysql-test/r/query_cache_noembeded.result:
New BitKeeper file ``mysql-test/r/query_cache_noembeded.result''
mysql-test/t/query_cache_noembeded.test:
New BitKeeper file ``mysql-test/t/query_cache_noembeded.test''
myisam/mi_check.c:
different search function is used for SPATIAL keys
mysql-test/r/gis-rtree.result:
test result fixed
mysql-test/t/gis-rtree.test:
test case
Added a test case for bug #12392.
item_cmpfunc.cc:
Fixed bug #12392.
Missing handling of rows containing NULL components
when evaluating IN predicates caused a crash.
sql/item_cmpfunc.cc:
Fixed bug #12392.
Missing handling of rows containing NULL components
when evaluating IN predicates caused a crash.
mysql-test/r/subselect.result:
Added a test case for bug #12392.
mysql-test/t/subselect.test:
Added a test case for bug #12392.
- Fixed some error condtion when handling dates with 'T'
- Added extra test for bug #11867 (Wrong result with "... WHERE ROW( a, b ) IN ( SELECT DISTINCT a, b WHERE ...)" to show it's not yet fixed
- Safety fixes and cleanups
mysql-test/r/subselect.result:
Added extra test case to test case for bug #11867
(Result shows that current code is not yet right and needs to be fixed)
mysql-test/r/type_datetime.result:
More tests for dates of type CCYYMMDDTHHMMSS
mysql-test/t/subselect.test:
Added extra test case to test case for bug #11867
mysql-test/t/type_datetime.test:
More tests for dates of type CCYYMMDDTHHMMSS
sql-common/my_time.c:
Fixed handling of dates of type CCYYMMDDTHHMMSS
(Old code couldn't handle 2003-0304 or 2003-0003-02)
sql/slave.cc:
Indentation cleanup
sql/sql_parse.cc:
Added test of return value of get_system_var()
sql/sql_select.cc:
Removed unnecessary call to field->table->maybe_null
sql/sql_union.cc:
Indentation fixes
BUG #11104
Took out the offset-=delimiter_length-1 out of the for loop. It was causing
basically this:
select substring_index('the king of the the hill', 'the', -2) to not work.
The first iteration, offset would be initialised to 24, then strstr would
point at 'the king of the the* hill' ('*'means right before the
character following), returning a offset of 16. The for loop would then
decrement offset by two (3 - 1), to 14, now pointing at
"the king of th*e the hill", _skipping_ past the 'e' in the second to last
'the', and therefore strstr would never have a chance of matching the
second to last 'the', then moving on to the 'the' at the begginning of the
string!
In a nutshell, offset was being decremented by too great a value, preventing
the second to last 'the' from being ever found, hence the result of
'king of the the hill' from the query that is reported in the bug report
func_str.test:
BUG #11104
Added tests to make sure fix addresses issues in original bug report
func_str.result:
BUG #11104
New results for new tests
mysql-test/r/func_str.result:
BUG #11104
New results for new tests
mysql-test/t/func_str.test:
BUG #11104
Added tests to make sure fix addresses issues in original bug report
sql/item_strfunc.cc:
BUG #11104
Took out the offset-=delimiter_length-1 out of the for loop. It was causing
basically this:
select substring_index('the king of the the hill', 'the', -2) to not work.
The first iteration, offset would be initialised to 24, then strstr would
point at 'the king of the the* hill' ('*'means right before the
character following), returning a offset of 16. The for loop would then
decrement offset by two (3 - 1), to 14, now pointing at
"the king of th*e the hill", _skipping_ past the 'e' in the second to last
'the', and therefore strstr would never have a chance of matching the
second to last 'the', then moving on to the 'the' at the begginning of the
string!
In a nutshell, offset was being decremented by too great a value, preventing
the second to last 'the' from being ever found, hence the result of
'king of the the hill' from the query that is reported in the bug report
adding test case
item_strfunc.cc:
Bug#12351
CONCAT with USER()/DATEBASE() and
a column gets strange results.
Mark created Item_str as constant, so CONCAT
cannot reuse it for optimization purposes.
sql/item_strfunc.cc:
Bug#12351
CONCAT with USER()/DATEBASE() and
a column gets strange results
mysql-test/t/func_system.test:
adding test case
mysql-test/r/func_system.result:
adding test case
Changed assembler functions to not access global variables or variables in text segement
Added wrapper function in C to longlong2str() to pass _dig_vec_upper as an argument
mysql-test/r/bigint.result:
More tests for parsing of bigint's
More tests for different values to conv()
mysql-test/t/bigint.test:
More tests for parsing of bigint's
More tests for different values to conv()
strings/Makefile.am:
Added longlong2str_asm.c
strings/longlong2str-x86.s:
Changed functions to not access variables in text segment
Fixed this by adding global variable '_dig_vec_upper' as an argument to longlong2str_with_dig_vector()
strings/my_strtoll10-x86.s:
Removd array lfactor by calculating the value in code
(this is to to make the code position independent)
strings/longlong2str_asm.c:
New BitKeeper file ``strings/longlong2str_asm.c''
Added test case for bug #11867.
Fixed results for two existing test cases.
subselect.test:
Added test case for bug #11867.
item_subselect.cc:
Fixed bug #11867.
Added missing code in Item_in_subselect::row_value_transformer
that caused problems for queries with
ROW(elems) IN (SELECT DISTINCT cols FROM ...).
sql/item_subselect.cc:
Fixed bug #11867.
Added missing code in Item_in_subselect::row_value_transformer
that caused problems for queries with
ROW(elems) IN (SELECT DISTINCT cols FROM ...).
mysql-test/t/subselect.test:
Added test case for bug #11867.
mysql-test/r/subselect.result:
Added test case for bug #11867.
Fixed results for two existing test cases.
In init_prepare_fake_select_lex() don't empty ftfunc_list. UNION's ORDER BY clause may
contain MATCH(...), for which fix_index() should be called.
mysql-test/r/fulltext_order_by.result:
BUG#11869 part2 : added another test case
mysql-test/t/fulltext_order_by.test:
BUG#11869 part2 : added another test case
"INSERT .. SELECT ... ON DUPLICATE KEY UPDATE fails"
Ensure that check_insert_fields() is only called once when
doing an INSERT..SELECT
mysql-test/r/insert_update.result:
Test for bug 10109
mysql-test/t/insert_update.test:
Test for bug 10109
sql/sql_class.h:
select_insert needs more state
sql/sql_insert.cc:
ensure that check_insert_fields() is only called once when
doing an INSERT...SELECT
sql/sql_parse.cc:
more args for select_insert constructor
When creating temporary table for UNION, pass TMP_TABLE_FORCE_MYISAM flag to
create_tmp_table if we will be using fulltext function(s) when reading from the
temp. table.
mysql-test/r/fulltext_order_by.result:
Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error)
mysql-test/t/fulltext_order_by.test:
Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error)
sql/mysql_priv.h:
BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
Added TMP_TABLE_FORCE_MYISAM flag
sql/sql_select.cc:
BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
In create_tmp_table(), honor the TMP_TABLE_FORCE_MYISAM flag
item.cc:
item.h:
Adding Item_param::safe_charset_converter,
not to return collation mix error if
parameter can be converted into operation
character set.
ctype_utf8.result:
adding test case
ctype_utf8.test:
adding test case
sql/item.h:
Bug #12371 executing prepared statement fails (illegal mix of collations)
Adding Item_param::safe_charset_converter,
not to returm collation mix error if
parameter can be converted into operation
character set.
sql/item.cc:
Bug #12371 executing prepared statement fails (illegal mix of collations)
mysql-test/t/ctype_utf8.test:
adding test case
mysql-test/r/ctype_utf8.result:
adding
Added a check before taking a global read lock if
the own thread has a write locked table.
mysql-test/r/flush.result:
Bug#9459 - deadlock with flush with lock, and lock table write
The test result.
mysql-test/t/flush.test:
Bug#9459 - deadlock with flush with lock, and lock table write
The test case.
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
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.
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.
needed to be fixed in earlier versions)
Fixed the iteration of how substrings are handled with negative indexes in
SUBSTRING_INDEX
mysql-test/r/func_str.result:
New results for the fix to substring_index
mysql-test/t/func_str.test:
Added tests for fix to substring_index, various lenth search patterns. Also included
are the queuries the user who reported the bug listed in the bug report
sql/item_strfunc.cc:
Fix to BUG 11104
Took out the offset-=delimiter_length-1 out of the for loop. It was causing
basically this:
select substring_index('the king of the the hill', 'the', -2) to not work.
The first iteration, offset would be initialised to 24, then strstr would
point at 'the king of the the* hill' ('*'means right before the
character following), returning a offset of 16. The for loop would then
decrement offset by two (3 - 1), to 14, now pointing at
"the king of th*e the hill", _skipping_ past the 'e' in the second to last
'the', and therefore strstr would never have a chance of matching the
second to last 'the', then moving on to the 'the' at the begginning of the
string!
In a nutshell, offset was being decremented by too great a value, preventing
the second to last 'the' from being ever found, hence the result of
'king of the the hill' from the query that is reported in the bug report
Modified test case for bug #12144.
mysql-test/t/null_key.test:
Modified test case for bug #12144.
mysql-test/r/null_key.result:
Modified test case for bug #12144.
to connect
mysql-test/r/rpl_slave_status.result:
updated result
mysql-test/t/rpl_slave_status.test:
user vertical result
sql/slave.cc:
reversed an unnecessary change for BUG#10780
sql/slave.h:
reversed an unnecessary change for BUG#10780
notembedded-specific part moved to the new test
mysql-test/r/query_cache.result:
test result fixed
mysql-test/t/query_cache.test:
notembedded-only part of the test removed
Added a test case for bug #12095.
sql_class.h:
Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
Added a flag to the TMP_TABLE_PARAM class forcing to put constant
items generated after elimination of a single row table into temp table
in some cases (e.g. when GROUP_CONCAT is calculated over a single row
table).
bk ci sql/item_sum.cc
Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
If GROUP_CONCAT is calculated we always put its argument into a temp
table, even when the argument is a constant item.
sql_select.cc:
Fixed bug #12095: a join query with GROUP_CONCAT over one row table.
If temp table is used to calculate GROUP_CONCAT the argument should
be always put into this table, even when it is a constant item.
sql/sql_select.cc:
Fixed bug #12095: a join query with GROUP_CONCAT over one row table.
If temp table is used to calculate GROUP_CONCAT the argument should
be always put into this table, even when it is a constant item.
sql/sql_class.h:
Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
Added a flag to the TMP_TABLE_PARAM class forcing to put constant
items generated after elimination of a single row table into temp table
in some cases (e.g. when GROUP_CONCAT is calculated over a single row
table).
bk ci sql/item_sum.cc
Fixed bug #12095: a join query with GROUP_CONCAT over a single row table.
If GROUP_CONCAT is calculated we always put its argument into a temp
table, even when the argument is a constant item.
mysql-test/t/func_gconcat.test:
Added a test case for bug #12095.
mysql-test/r/func_gconcat.result:
Added a test case for bug #12095.
Made the test case for bug #12144 independent on other tests.
mysql-test/r/null_key.result:
Made the test case for bug #12144 independent on other tests.
mysql-test/t/null_key.test:
Made the test case for bug #12144 independent on other tests.
Modified the test case for patch of the bug #12144
to display status of Handler_read_next before and
after the tested query.
mysql-test/r/null_key.result:
Modified the test case for patch of the bug #12144
to display status of Handler_read_next before and
after the tested query.
mysql-test/t/null_key.test:
Modified the test case for patch of the bug #12144
to display status of Handler_read_next before and
after the tested query.
Fixed bug #12144.
Added an optimization that avoids key access with null keys for the 'ref'
method when used in outer joins. The regilar optimization with adding
IS NOT NULL expressions is not applied for outer join on expressions as
the predicates of these expressions are not pushed down in 4.1.
null_key.result, null_key.test:
Added a test case for bug #12144.
mysql-test/t/null_key.test:
Added a test case for bug #12144.
mysql-test/r/null_key.result:
Added a test case for bug #12144.
sql/sql_select.cc:
Fixed bug #12144.
Added an optimization that avoids key access with null keys for the 'ref'
method when used in outer joins. The regilar optimization with adding
IS NOT NULL expressions is not applied for outer join on expressions as
the predicates of these expressions are not pushed down in 4.1.
mysql-test/t/alias.test:
Added end marker for test to make future merges easier
mysql-test/t/alter_table.test:
Added end marker for test to make future merges easier
mysql-test/t/analyse.test:
Added end marker for test to make future merges easier
mysql-test/t/analyze.test:
Added end marker for test to make future merges easier
Fixed length of comment lines
mysql-test/t/ansi.test:
Added end marker for test to make future merges easier
mysql-test/t/archive.test:
Added end marker for test to make future merges easier
mysql-test/t/auto_increment.test:
Added end marker for test to make future merges easier
mysql-test/t/backup.test:
Added end marker for test to make future merges easier
mysql-test/t/bdb-alter-table-1.test:
Added end marker for test to make future merges easier
mysql-test/t/bdb-alter-table-2.test:
Added end marker for test to make future merges easier
mysql-test/t/bdb-crash.test:
Added end marker for test to make future merges easier
mysql-test/t/bdb-deadlock.test:
Added end marker for test to make future merges easier
mysql-test/t/bdb-deadlock.tminus:
Added end marker for test to make future merges easier
mysql-test/t/bdb.test:
Added end marker for test to make future merges easier
mysql-test/t/bdb_cache.test:
Added end marker for test to make future merges easier
mysql-test/t/bench_count_distinct.test:
Added end marker for test to make future merges easier
mysql-test/t/bigint.test:
Added end marker for test to make future merges easier
mysql-test/t/binary.test:
Added end marker for test to make future merges easier
mysql-test/t/blackhole.test:
Added end marker for test to make future merges easier
mysql-test/t/bool.test:
Added end marker for test to make future merges easier
mysql-test/t/bulk_replace.test:
Added end marker for test to make future merges easier
mysql-test/t/case.test:
Added end marker for test to make future merges easier
mysql-test/t/cast.test:
Added end marker for test to make future merges easier
mysql-test/t/check.test:
Added end marker for test to make future merges easier
mysql-test/t/comments.test:
Added end marker for test to make future merges easier
mysql-test/t/compare.test:
Added end marker for test to make future merges easier
mysql-test/t/connect.test:
Added end marker for test to make future merges easier
mysql-test/t/consistent_snapshot.test:
Added end marker for test to make future merges easier
mysql-test/t/constraints.test:
Added end marker for test to make future merges easier
mysql-test/t/count_distinct.test:
Added end marker for test to make future merges easier
mysql-test/t/count_distinct2.test:
Added end marker for test to make future merges easier
mysql-test/t/count_distinct3.test:
Added end marker for test to make future merges easier
mysql-test/t/create.test:
Added end marker for test to make future merges easier
mysql-test/t/create_select_tmp.test:
Added end marker for test to make future merges easier
mysql-test/t/csv.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_big5.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_collate.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_cp1250_ch.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_cp1251.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_cp932.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_create.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_gbk.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_latin1.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_latin1_de.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_latin2.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_many.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_mb.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_recoding.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_sjis.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_tis620.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_uca.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_ucs.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_ucs_binlog.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_ujis.test:
Added end marker for test to make future merges easier
mysql-test/t/ctype_utf8.test:
Added end marker for test to make future merges easier
mysql-test/t/date_formats.test:
Added end marker for test to make future merges easier
mysql-test/t/delayed.test:
Added end marker for test to make future merges easier
mysql-test/t/delete.test:
Added end marker for test to make future merges easier
mysql-test/t/derived.test:
Added end marker for test to make future merges easier
mysql-test/t/dirty_close.test:
Added end marker for test to make future merges easier
mysql-test/t/distinct.test:
Added end marker for test to make future merges easier
mysql-test/t/drop.test:
Added end marker for test to make future merges easier
mysql-test/t/drop_temp_table.test:
Added end marker for test to make future merges easier
mysql-test/t/empty_table.test:
Added end marker for test to make future merges easier
mysql-test/t/endspace.test:
Added end marker for test to make future merges easier
mysql-test/t/errors.test:
Added end marker for test to make future merges easier
mysql-test/t/exampledb.test:
Added end marker for test to make future merges easier
mysql-test/t/explain.test:
Added end marker for test to make future merges easier
mysql-test/t/flush.test:
Added end marker for test to make future merges easier
mysql-test/t/flush_block_commit.test:
Added end marker for test to make future merges easier
mysql-test/t/flush_table.test:
Added end marker for test to make future merges easier
mysql-test/t/foreign_key.test:
Added end marker for test to make future merges easier
mysql-test/t/fulltext.test:
Added end marker for test to make future merges easier
mysql-test/t/fulltext2.test:
Added end marker for test to make future merges easier
mysql-test/t/fulltext_cache.test:
Added end marker for test to make future merges easier
mysql-test/t/fulltext_distinct.test:
Added end marker for test to make future merges easier
mysql-test/t/fulltext_left_join.test:
Added end marker for test to make future merges easier
mysql-test/t/fulltext_multi.test:
Added end marker for test to make future merges easier
mysql-test/t/fulltext_order_by.test:
Added end marker for test to make future merges easier
mysql-test/t/fulltext_update.test:
Added end marker for test to make future merges easier
mysql-test/t/fulltext_var.test:
Added end marker for test to make future merges easier
mysql-test/t/func_compress.test:
Added end marker for test to make future merges easier
mysql-test/t/func_concat.test:
Added end marker for test to make future merges easier
mysql-test/t/func_crypt.test:
Added end marker for test to make future merges easier
mysql-test/t/func_date_add.test:
Added end marker for test to make future merges easier
mysql-test/t/func_default.test:
Added end marker for test to make future merges easier
mysql-test/t/func_des_encrypt.test:
Added end marker for test to make future merges easier
mysql-test/t/func_encrypt.test:
Added end marker for test to make future merges easier
mysql-test/t/func_encrypt_nossl.test:
Added end marker for test to make future merges easier
mysql-test/t/func_equal.test:
Added end marker for test to make future merges easier
mysql-test/t/func_gconcat.test:
Added end marker for test to make future merges easier
mysql-test/t/func_group.test:
Added end marker for test to make future merges easier
mysql-test/t/func_if.test:
Added end marker for test to make future merges easier
mysql-test/t/func_in.test:
Added end marker for test to make future merges easier
mysql-test/t/func_isnull.test:
Added end marker for test to make future merges easier
mysql-test/t/func_like.test:
Added end marker for test to make future merges easier
mysql-test/t/func_math.test:
Added end marker for test to make future merges easier
mysql-test/t/func_misc.test:
Added end marker for test to make future merges easier
mysql-test/t/func_op.test:
Added end marker for test to make future merges easier
mysql-test/t/func_regexp.test:
Added end marker for test to make future merges easier
mysql-test/t/func_sapdb.test:
Added end marker for test to make future merges easier
mysql-test/t/func_set.test:
Added end marker for test to make future merges easier
mysql-test/t/func_str.test:
Added end marker for test to make future merges easier
mysql-test/t/func_system.test:
Added end marker for test to make future merges easier
mysql-test/t/func_test.test:
Added end marker for test to make future merges easier
mysql-test/t/func_time.test:
Added end marker for test to make future merges easier
mysql-test/t/func_timestamp.test:
Added end marker for test to make future merges easier
mysql-test/t/gcc296.test:
Added end marker for test to make future merges easier
mysql-test/t/gis-rtree.test:
Added end marker for test to make future merges easier
mysql-test/t/gis.test:
Added end marker for test to make future merges easier
mysql-test/t/grant.test:
Added end marker for test to make future merges easier
mysql-test/t/grant2.test:
Added end marker for test to make future merges easier
mysql-test/t/grant_cache.test:
Added end marker for test to make future merges easier
mysql-test/t/group_by.test:
Added end marker for test to make future merges easier
mysql-test/t/handler.test:
Added end marker for test to make future merges easier
mysql-test/t/having.test:
Added end marker for test to make future merges easier
mysql-test/t/heap.test:
Added end marker for test to make future merges easier
mysql-test/t/heap_auto_increment.test:
Added end marker for test to make future merges easier
mysql-test/t/heap_btree.test:
Added end marker for test to make future merges easier
mysql-test/t/heap_hash.test:
Added end marker for test to make future merges easier
mysql-test/t/help.test:
Added end marker for test to make future merges easier
mysql-test/t/init_connect.test:
Added end marker for test to make future merges easier
mysql-test/t/init_file.test:
Added end marker for test to make future merges easier
mysql-test/t/innodb-deadlock.test:
Added end marker for test to make future merges easier
mysql-test/t/innodb-lock.test:
Added end marker for test to make future merges easier
mysql-test/t/innodb-replace.test:
Added end marker for test to make future merges easier
mysql-test/t/innodb.test:
Added end marker for test to make future merges easier
mysql-test/t/innodb_cache.test:
Added end marker for test to make future merges easier
mysql-test/t/innodb_handler.test:
Added end marker for test to make future merges easier
mysql-test/t/insert.test:
Added end marker for test to make future merges easier
mysql-test/t/insert_select-binlog.test:
Added end marker for test to make future merges easier
mysql-test/t/insert_select.test:
Added end marker for test to make future merges easier
mysql-test/t/insert_update.test:
Added end marker for test to make future merges easier
mysql-test/t/isam.test:
Added end marker for test to make future merges easier
mysql-test/t/join.test:
Added end marker for test to make future merges easier
mysql-test/t/join_crash.test:
Added end marker for test to make future merges easier
mysql-test/t/join_outer.test:
Added end marker for test to make future merges easier
mysql-test/t/key.test:
Added end marker for test to make future merges easier
mysql-test/t/key_cache.test:
Added end marker for test to make future merges easier
mysql-test/t/key_diff.test:
Added end marker for test to make future merges easier
mysql-test/t/key_primary.test:
Added end marker for test to make future merges easier
mysql-test/t/keywords.test:
Added end marker for test to make future merges easier
mysql-test/t/kill.test:
Added end marker for test to make future merges easier
mysql-test/t/limit.test:
Added end marker for test to make future merges easier
mysql-test/t/loaddata.test:
Added end marker for test to make future merges easier
mysql-test/t/lock.test:
Added end marker for test to make future merges easier
mysql-test/t/lock_multi.test:
Added end marker for test to make future merges easier
mysql-test/t/lock_tables_lost_commit.test:
Added end marker for test to make future merges easier
mysql-test/t/lowercase_table.test:
Added end marker for test to make future merges easier
mysql-test/t/lowercase_table2.test:
Added end marker for test to make future merges easier
mysql-test/t/lowercase_table3.test:
Added end marker for test to make future merges easier
mysql-test/t/lowercase_table_grant.test:
Added end marker for test to make future merges easier
mysql-test/t/lowercase_table_qcache.test:
Added end marker for test to make future merges easier
mysql-test/t/merge.test:
Added end marker for test to make future merges easier
mysql-test/t/metadata.test:
Added end marker for test to make future merges easier
mysql-test/t/mix_innodb_myisam_binlog.test:
Added end marker for test to make future merges easier
mysql-test/t/multi_statement.test:
Added end marker for test to make future merges easier
mysql-test/t/multi_update.test:
Added end marker for test to make future merges easier
mysql-test/t/myisam-blob.test:
Added end marker for test to make future merges easier
mysql-test/t/myisam.test:
Added end marker for test to make future merges easier
mysql-test/t/mysql_client_test.test:
Added end marker for test to make future merges easier
mysql-test/t/mysql_protocols.test:
Added end marker for test to make future merges easier
mysql-test/t/mysqlbinlog.test:
Added end marker for test to make future merges easier
mysql-test/t/mysqlbinlog2.test:
Added end marker for test to make future merges easier
mysql-test/t/mysqldump.test:
Added end marker for test to make future merges easier
mysql-test/t/mysqltest.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_alter_table.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_autodiscover.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_autodiscover2.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_basic.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_blob.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_cache.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_charset.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_config.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_database.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_grant.later:
Added end marker for test to make future merges easier
mysql-test/t/ndb_index.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_index_ordered.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_index_unique.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_insert.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_limit.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_lock.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_minmax.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_multi.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_replace.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_restore.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_subquery.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_transaction.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_truncate.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_types.test:
Added end marker for test to make future merges easier
mysql-test/t/ndb_update.test:
Added end marker for test to make future merges easier
mysql-test/t/negation_elimination.test:
Added end marker for test to make future merges easier
mysql-test/t/not_embedded_server.test:
Added end marker for test to make future merges easier
mysql-test/t/null.test:
Added end marker for test to make future merges easier
mysql-test/t/null_key.test:
Added end marker for test to make future merges easier
mysql-test/t/odbc.test:
Added end marker for test to make future merges easier
mysql-test/t/olap.test:
Added end marker for test to make future merges easier
mysql-test/t/openssl_1.test:
Added end marker for test to make future merges easier
mysql-test/t/order_by.test:
Added end marker for test to make future merges easier
mysql-test/t/order_fill_sortbuf.test:
Added end marker for test to make future merges easier
mysql-test/t/outfile.test:
Added end marker for test to make future merges easier
mysql-test/t/overflow.test:
Added end marker for test to make future merges easier
mysql-test/t/packet.test:
Added end marker for test to make future merges easier
mysql-test/t/preload.test:
Added end marker for test to make future merges easier
mysql-test/t/ps.test:
Added end marker for test to make future merges easier
mysql-test/t/ps_10nestset.test:
Added end marker for test to make future merges easier
mysql-test/t/ps_11bugs.test:
Added end marker for test to make future merges easier
mysql-test/t/ps_1general.test:
Added end marker for test to make future merges easier
mysql-test/t/ps_2myisam.test:
Added end marker for test to make future merges easier
mysql-test/t/ps_3innodb.test:
Added end marker for test to make future merges easier
mysql-test/t/ps_4heap.test:
Added end marker for test to make future merges easier
mysql-test/t/ps_5merge.test:
Added end marker for test to make future merges easier
mysql-test/t/ps_6bdb.test:
Added end marker for test to make future merges easier
mysql-test/t/ps_7ndb.test:
Added end marker for test to make future merges easier
mysql-test/t/ps_grant.test:
Added end marker for test to make future merges easier
mysql-test/t/query_cache.test:
Added end marker for test to make future merges easier
mysql-test/t/query_cache_merge.test:
Added end marker for test to make future merges easier
mysql-test/t/raid.test:
Added end marker for test to make future merges easier
mysql-test/t/range.test:
Added end marker for test to make future merges easier
mysql-test/t/rename.test:
Added end marker for test to make future merges easier
mysql-test/t/repair.test:
Added end marker for test to make future merges easier
mysql-test/t/replace.test:
Added end marker for test to make future merges easier
mysql-test/t/rollback.test:
Added end marker for test to make future merges easier
mysql-test/t/row.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000001.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000002.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000004.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000005.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000006.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000008.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000009.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000010.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000011.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000012.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000013.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000015.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000017.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl000018.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_EE_error.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_alter.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_chain_temp_table.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_change_master.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_charset.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_commit_after_flush.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_create_database.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_ddl.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_deadlock.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_delete_all.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_do_grant.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_drop.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_drop_temp.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_empty_master_crash.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_error_ignored_table.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_failed_optimize.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_failsafe.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_flush_log_loop.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_flush_tables.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_free_items.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_get_lock.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_heap.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_ignore_grant.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_init_slave.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_innodb.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_insert_id.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_insert_ignore.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddata.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddata_rule_m.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddata_rule_s.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_loaddatalocal.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_log.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_log_pos.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_many_optimize.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_master_pos_wait.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_max_relay_size.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_misc_functions.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_delete.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_delete2.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_query.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_update.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_update2.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_multi_update3.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_mystery22.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_openssl.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_optimize.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_ps.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_redirect.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_relayrotate.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_relayspace.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_replicate_do.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_reset_slave.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_rewrite_db.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_rotate_logs.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_server_id1.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_server_id2.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_set_charset.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_skip_error.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_sporadic_master.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_start_stop_slave.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_temporary.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_timezone.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_trunc_binlog.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_until.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_user_variables.test:
Added end marker for test to make future merges easier
mysql-test/t/rpl_variables.test:
Added end marker for test to make future merges easier
mysql-test/t/select.test:
Added end marker for test to make future merges easier
mysql-test/t/select_found.test:
Added end marker for test to make future merges easier
mysql-test/t/select_safe.test:
Added end marker for test to make future merges easier
mysql-test/t/show_check.test:
Added end marker for test to make future merges easier
mysql-test/t/skip_name_resolve.test:
Added end marker for test to make future merges easier
mysql-test/t/sql_mode.test:
Added end marker for test to make future merges easier
mysql-test/t/status.test:
Added end marker for test to make future merges easier
mysql-test/t/subselect.test:
Added end marker for test to make future merges easier
mysql-test/t/subselect2.test:
Added end marker for test to make future merges easier
mysql-test/t/subselect_gis.test:
Added end marker for test to make future merges easier
mysql-test/t/subselect_innodb.test:
Added end marker for test to make future merges easier
mysql-test/t/symlink.test:
Added end marker for test to make future merges easier
mysql-test/t/synchronization.test:
Added end marker for test to make future merges easier
mysql-test/t/system_mysql_db.test:
Added end marker for test to make future merges easier
mysql-test/t/system_mysql_db_fix.test:
Added end marker for test to make future merges easier
mysql-test/t/system_mysql_db_refs.test:
Added end marker for test to make future merges easier
mysql-test/t/tablelock.test:
Added end marker for test to make future merges easier
mysql-test/t/temp_table.test:
Added end marker for test to make future merges easier
mysql-test/t/timezone.test:
Added end marker for test to make future merges easier
mysql-test/t/timezone2.test:
Added end marker for test to make future merges easier
mysql-test/t/timezone3.test:
Added end marker for test to make future merges easier
mysql-test/t/timezone_grant.test:
Added end marker for test to make future merges easier
mysql-test/t/truncate.test:
Added end marker for test to make future merges easier
mysql-test/t/type_blob.test:
Added end marker for test to make future merges easier
mysql-test/t/type_date.test:
Added end marker for test to make future merges easier
mysql-test/t/type_datetime.test:
Added end marker for test to make future merges easier
mysql-test/t/type_decimal.test:
Added end marker for test to make future merges easier
mysql-test/t/type_enum.test:
Added end marker for test to make future merges easier
mysql-test/t/type_float.test:
Added end marker for test to make future merges easier
mysql-test/t/type_nchar.test:
Added end marker for test to make future merges easier
mysql-test/t/type_ranges.test:
Added end marker for test to make future merges easier
mysql-test/t/type_set.test:
Added end marker for test to make future merges easier
mysql-test/t/type_time.test:
Added end marker for test to make future merges easier
mysql-test/t/type_timestamp.test:
Added end marker for test to make future merges easier
mysql-test/t/type_uint.test:
Added end marker for test to make future merges easier
mysql-test/t/type_year.test:
Added end marker for test to make future merges easier
mysql-test/t/union.test:
Added end marker for test to make future merges easier
mysql-test/t/update.test:
Added end marker for test to make future merges easier
mysql-test/t/user_var-binlog.test:
Added end marker for test to make future merges easier
mysql-test/t/user_var.test:
Added end marker for test to make future merges easier
mysql-test/t/varbinary.test:
Added end marker for test to make future merges easier
mysql-test/t/variables.test:
Added end marker for test to make future merges easier
mysql-test/t/warnings.test:
Added end marker for test to make future merges easier
mysql-test/r/ps_grant.result:
Deallocate prepare statements
Moved test for 'show full processlist' to not_embedded_server.test becasue it's shouldn't be here and it could fail on a slow computer where previous connections has not yet disconnected
mysql-test/t/ps_grant.test:
Deallocate prepare statements
Moved test for 'show full processlist' to not_embedded_server.test becasue it's shouldn't be here and it could fail on a slow computer where previous connections has not yet disconnected
sql/sql_lex.cc:
Fixed typo
mysql-test/r/not_embedded_server.result:
New BitKeeper file ``mysql-test/r/not_embedded_server.result''
mysql-test/t/not_embedded_server.test:
New BitKeeper file ``mysql-test/t/not_embedded_server.test''
BitKeeper/etc/ignore:
added ndb/tools/ndb_config
