sql/ha_federated.cc:
Re-application of patch from earlier, adding debug to create_where_from_key as well
as small bug fix for setting of records and deleted in delete_all_rows to after db call.
mysql-test/r/archive.result:
Result file for adding check table support
mysql-test/t/archive.test:
Simple test for check table. The additional select is added just to make sure the file is not destroyed.
sql/ha_archive.cc:
Updates for adding CHECK table support. is_crashed() now returns the state of the file.
sql/ha_archive.h:
Updates for adding CHECK table support
mysql-test/r/update.result:
Auto merged
mysql-test/t/update.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/records.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/structs.h:
Auto merged
use USE_PRAGMA_INTERFACE before include of my_global.h,
where it is defined
server-tools/instance-manager/command.h:
don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/listener.h:
don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/mysql_connection.h:
don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/options.h:
don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/thread_registry.cc:
fix register
server-tools/instance-manager/thread_registry.h:
don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
server-tools/instance-manager/user_map.h:
don't use USE_PRAGMA_INTERFACE before my_global.h, where it is defined
mysql-test/r/skip_grants.result:
creation view with DEFINER clause if --skip-grant-tables
mysql-test/t/skip_grants.test:
creation view with DEFINER clause if --skip-grant-tables
sql/sql_acl.cc:
check of ACL initialization in is_acl_user()
mysql-test/my_manage.c:
Avoid warning: i not used in case of Windows.
mysql-test/mysql_test_run_new.c:
Removed unused variable.
sql/item_func.cc:
Removed unused variables.
strings/ctype-simple.c:
Added cast.
strings/ctype-ucs2.c:
Added cast.
sql/sql_show.cc:
1. Use Field_longlong::store(longlong nr, bool unsigned_val) for ulonglong values
instead of Field_longlong::store(double nr).
2. CHARACTER_OCTET_LENGTH and CHARACTER_MAXIMUM_LENGTH fields filing order fixed (8 <-> 9).
'information_schema' is excluded from list of databases for mysqlcheck command
mysql-test/mysql-test-run.pl:
dded support for 'mysqlcheck'
mysql-test/mysql-test-run.sh:
dded support for 'mysqlcheck'
The lack of this --replace resulted in the test failing on all build hosts
mysql-test/r/im_life_cycle.result:
fix result
mysql-test/t/im_life_cycle.imtest:
replace instance port number in result, as it could be set differently for different
test runs.
droping trigger on InnoDB table".
Deadlock occured in cases when we were trying to create two triggers for
the same InnoDB table concurrently and both threads were able to reach
close_cached_table() simultaneously. Bugfix implements new approach to
table locking and table cache invalidation during creation/dropping
of trigger.
No testcase is supplied since bug was repeatable only under high concurrency.
sql/mysql_priv.h:
reopen_name_locked_table():
Changed function signature to make it more robust against erroneous usage.
sql/sql_base.cc:
reopen_name_locked_table():
Changed function signature to make it more robust against erroneous usage.
Obtaining LOCK_open lock is now resposibility of caller.
When searching for the table to open we should not prefer connection's current
database over database which was explicitly specified in TABLE_LIST::db member
(even if database is not explicitly specified for table in original query
TABLE_LIST::db will be set properly at parsing stage).
Fixed behavior of function in cases when error occurs during opening of table.
sql/sql_table.cc:
prepare_for_restore()/prepare_for_repair():
We should not prefer connection's current database over database which was
specified in TABLE_LIST::db member (even if database is not explicitly
specified for table in original query TABLE_LIST::db will be set properly
at parsing stage). Fixed behavior in unlikely case when we are unable
to open table which we are restoring/reparing at the end of preparation
stage.
sql/sql_trigger.cc:
mysql_create_or_drop_trigger():
Now instead of opening and locking table, creating trigger, and then trying
to invalidate all instances of this table in table cache, we obtain name
lock on table first (thus ensuring that no other thread has this table
open), open it, create trigger and then close table therefore releasing lock.
New approach is more in line with other places where change .frm files
(i.e. change table meta-data).
With this change we also get rid of deadlock which occured in cases when we
were trying to create two triggers for the same InnoDB table concurrently
and both threads were able to reach close_cached_table() simultaneously.
(Alternative was to forbid to InnoDB downgrade locks for CREATE/DROP
TRIGGER statements in one way or another but I think that proposed
solution is better long term).
Applying patch from Marko.
All tests pass in pentium-debug-max build on Linux.
innobase/include/rem0rec.h:
BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
Applying patch from Marko.
innobase/include/rem0rec.ic:
BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
Applying patch from Marko.
innobase/row/row0upd.c:
BUG#13900 DATETIME data changes after inserting a new row in a InnoDB table
Applying patch from Marko.
into selena.:H:/MYSQL/src/#13377-mysql-5.0
mysql-test/include/check_var_limit.inc:
Auto merged
mysql-test/include/have_big5.inc:
Auto merged
mysql-test/include/have_compress.inc:
Auto merged
mysql-test/include/have_crypt.inc:
Auto merged
mysql-test/include/have_outfile.inc:
Auto merged
mysql-test/include/have_query_cache.inc:
Auto merged
mysql-test/include/have_tis620.inc:
Auto merged
mysql-test/include/have_ucs2.inc:
Auto merged
mysql-test/include/have_ujis.inc:
Auto merged
mysql-test/include/not_embedded.inc:
Auto merged
mysql-test/include/system_db_struct.inc:
Auto merged
mysql-test/include/test_outfile.inc:
Auto merged
mysql-test/r/greedy_optimizer.result:
Auto merged
mysql-test/r/index_merge.result:
Auto merged
mysql-test/r/index_merge_bdb.result:
Auto merged
mysql-test/r/index_merge_innodb.result:
Auto merged
mysql-test/r/index_merge_innodb2.result:
Auto merged
mysql-test/r/index_merge_ror.result:
Auto merged
mysql-test/r/index_merge_ror_cpk.result:
Auto merged
mysql-test/r/join_nested.result:
Auto merged
mysql-test/r/rowid_order_bdb.result:
Auto merged
mysql-test/r/rowid_order_innodb.result:
Auto merged
mysql-test/r/rpl_session_var.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/sum_distinct.result:
Auto merged
mysql-test/std_data/des_key_file:
Auto merged
mysql-test/std_data/init_file.dat:
Auto merged
mysql-test/std_data/loaddata1.dat:
Auto merged
mysql-test/std_data/loaddata2.dat:
Auto merged
mysql-test/std_data/loaddata3.dat:
Auto merged
mysql-test/std_data/loaddata4.dat:
Auto merged
mysql-test/std_data/rpl_loaddata.dat:
Auto merged
mysql-test/std_data/rpl_loaddata2.dat:
Auto merged
mysql-test/std_data/warnings_loaddata.dat:
Auto merged
mysql-test/t/greedy_optimizer.test:
Auto merged
mysql-test/t/index_merge.test:
Auto merged
mysql-test/t/index_merge_bdb.test:
Auto merged
mysql-test/t/index_merge_innodb.test:
Auto merged
mysql-test/t/index_merge_innodb2.test:
Auto merged
mysql-test/t/index_merge_ror.test:
Auto merged
mysql-test/t/index_merge_ror_cpk.test:
Auto merged
mysql-test/t/join_nested.test:
Auto merged
mysql-test/t/rowid_order_bdb.test:
Auto merged
mysql-test/t/rowid_order_innodb.test:
Auto merged
mysql-test/t/rpl_session_var.test:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/sum_distinct.test:
Auto merged
sql/log.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/include/check_var_limit.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_big5.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_compress.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_crypt.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_outfile.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_query_cache.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_tis620.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_ucs2.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/have_ujis.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/not_embedded.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/system_db_struct.inc:
Turn off EOLN_NATIVE flag
mysql-test/include/test_outfile.inc:
Turn off EOLN_NATIVE flag
mysql-test/r/greedy_optimizer.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_bdb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_innodb2.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror.result:
Turn off EOLN_NATIVE flag
mysql-test/r/index_merge_ror_cpk.result:
Turn off EOLN_NATIVE flag
mysql-test/r/join_nested.result:
Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_bdb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/rowid_order_innodb.result:
Turn off EOLN_NATIVE flag
mysql-test/r/rpl_session_var.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sp-error.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sp-security.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sp.result:
Turn off EOLN_NATIVE flag
mysql-test/r/sum_distinct.result:
Turn off EOLN_NATIVE flag
mysql-test/std_data/des_key_file:
Turn off EOLN_NATIVE flag
mysql-test/std_data/init_file.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata1.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata2.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata3.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/loaddata4.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/rpl_loaddata2.dat:
Turn off EOLN_NATIVE flag
mysql-test/std_data/warnings_loaddata.dat:
Turn off EOLN_NATIVE flag
mysql-test/t/greedy_optimizer.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_bdb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_innodb2.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror.test:
Turn off EOLN_NATIVE flag
mysql-test/t/index_merge_ror_cpk.test:
Turn off EOLN_NATIVE flag
mysql-test/t/join_nested.test:
Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_bdb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/rowid_order_innodb.test:
Turn off EOLN_NATIVE flag
mysql-test/t/rpl_session_var.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sp-error.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sp-security.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sp.test:
Turn off EOLN_NATIVE flag
mysql-test/t/sum_distinct.test:
Turn off EOLN_NATIVE flag
into mysql.com:/home/pem/work/bug7049/mysql-5.0
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
mysql-test/r/sp.result:
Updated test results after fixing error handling in select.
sql/mysqld.cc:
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/protocol.cc:
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/sp_rcontext.h:
Added method for checking if the handler was found in the current context.
sql/sql_error.cc:
Make sure "select" aborts when finding a SP condition handler beyond the current scope.
