into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
manual merge
into may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.1
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/myisam.result:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_update.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/t/myisam.test:
Manual merge.
SHOW STATUS are not anymore put in slow query log because of no index usage.
Implemntation done by removing orig_sql_command and moving logic of SHOW STATUS to mysql_excute_command()
This simplifies code and allows us to remove some if statements all over the code.
Upgraded uc_update_queries[] to sql_command_flags and added more bitmaps to better categorize commands.
This allowed some overall simplifaction when testing sql_command.
Fixes bugs:
Bug#10210: running SHOW STATUS increments counters it shouldn't
Bug#19764: SHOW commands end up in the slow log as table scans
mysql-test/r/grant_cache.result:
Fixed results after SHOW STATUS doesn't anymore affect status variables
mysql-test/r/information_schema.result:
Added extra test to cover more code
mysql-test/r/query_cache.result:
Remove resuts from previous tests
mysql-test/r/status.result:
Added more tests for testing of last_query_cost and how SHOW STATUS affects status variables.
(Bug#10210)
mysql-test/r/temp_table.result:
Fixed results after SHOW STATUS doesn't anymore affect status variables
mysql-test/r/union.result:
Fixed results after SHOW STATUS is not logged to slow query log
(Bug#19764)
mysql-test/t/events_microsec.test:
Disable warnings at init
mysql-test/t/information_schema.test:
Added extra test to cover more code
mysql-test/t/query_cache.test:
Remove resuts from previous tests
mysql-test/t/status.test:
Added more tests for testing of last_query_cost and how SHOW STATUS affects status variables.
(Bug #10210)
sql/mysql_priv.h:
Added 'sql_command_flags'
sql/sql_class.cc:
New function add_diff_to_status(), used to update global status variables when using SHOW STATUS
sql/sql_class.h:
New function 'fill_information_schema_tables()'
(One could not anymore use fill_derived_tables() for this as only_view_structures() is not relevant for information schema tables)
Added defines for bit flags in sql_command_flags[]
sql/sql_lex.cc:
Remove orig_sql_command
sql/sql_lex.h:
Remove orig_sql_command
sql/sql_parse.cc:
Rename uc_update_queries -> sql_command_flags.
Enhanced 'sql_command_flags' to better classify SQL commands
uc_update_queries[] != 0 is changed to (sql_command_flags[] & CF_CHANGES_DATA)
lex->orig_sql_command == SQLCOM_END is changed to (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) == 0)
Simplify incrementing of thd->status_var.com_stat[] as we don't have to do special handling for SHOW commands.
Split SQLCOM_SELECT handling in mysql_execute_command() to a separate function.
Added special handling of SHOW STATUS commands in mysql_execute_command() and call common SQLCOM_SELECT handling.
These changes allows us to easily fix that we save and restore status variables during execution of a SHOW STATUS command.
Don't log SHOW STATUS commands to slow query log.
This fixes Bug#10210 and Bug#19764 without adding additional 'if' code.
(The new code is faster than the original as we now have fewer if's than before)
sql/sql_prepare.cc:
Clean up prepare-check handling of SQLCOM commands by using sql_command_flags[]
This simplifes code and ensures that code works even if someone forgets to put a new status commands into the switch statement.
sql/sql_select.cc:
Remove special handling of SHOW STATUS.
(This is now done in SQLCOM_SHOW_STATUS part in mysql_execute_command())
sql/sql_show.cc:
Remove orig_sql_command
Only change sql_command during 'open_normal_and_derived_tables()' (for views) and not for the full duration of generating data.
Changed 'show status' to use thd->initial_status_var to ensure that the current statement is not affecting the to-be-used values.
Use thd->fill_information_schema_tables() instead of 'thd->fill_derived_tables()' as the later wrongly checks the value of sql_command.
sql/sql_yacc.yy:
Remove usage of orig_sql_command.
One side effect of this is that we need to test for cursors if the current command is a SELECT or a SHOW command.
sql/structs.h:
Updated comment
into mysql.com:/home/stewart/Documents/MySQL/5.1/main
storage/ndb/include/util/ConfigValues.hpp:
Auto merged
storage/ndb/src/common/util/ConfigValues.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
manual merge (n/a in 5.1)
BUG#18036 - update of table joined to self reports table as crashed
Set exclude_from_table_unique_test value back to FALSE. It is needed for
further check in multi_update::prepare whether to use record cache.
sql/sql_update.cc:
Set exclude_from_table_unique_test value back to FALSE. It is needed for
further check in multi_update::prepare whether to use record cache.
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
mysql-test/r/ctype_sjis.result:
Auto merged
mysql-test/r/fulltext_left_join.result:
Auto merged
mysql-test/t/ctype_sjis.test:
Auto merged
mysql-test/t/fulltext_left_join.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
1. Removed '-P' command line option;
2. Renamed '--passwd' command line option to '--print-password-line'.
mysql-test/t/im_cmd_line.imtest:
Renamed "--passwd" to "--print-password-line".
server-tools/instance-manager/options.cc:
1. Removed '-P' option;
2. Renamed '--passwd' to '--print-password-line'.
server-tools/instance-manager/user_management_commands.cc:
Renamed class Passwd_cmd to Print_password_line_cmd.
server-tools/instance-manager/user_management_commands.h:
Renamed class Passwd_cmd to Print_password_line_cmd.
server-tools/instance-manager/guardian.cc:
Removed erroneous unlock() in Guardian_thread::init():
instance_map is unlocked in the caller.
server-tools/instance-manager/instance_map.cc:
Added TODO comment.
server-tools/instance-manager/manager.cc:
Make initialization of alarm infrustructure before starting Guardian
thread, because Guardian uses thr_alarm().
- fix for IM stopping routine;
- polishing.
mysql-test/lib/mtr_process.pl:
Polishing: make mtr_kill_process() more verbose in debug mode.
mysql-test/mysql-test-run.pl:
1. Fix stopping of IM running as a daemon -- after death of the main IM
process, we should wait for the IM angel to die.
2. Polishing -- be more verbose in debug mode.
can be started several times; monitor interval must be > 2sec
mysql-test/r/im_daemon_life_cycle.result:
Updated result file.
mysql-test/r/im_life_cycle.result:
Updated result file.
mysql-test/r/im_utils.result:
Updated result file.
mysql-test/t/im_daemon_life_cycle-im.opt:
Set monitoring interval to 1 second in order to:
- be consistent with 5.1;
- speed up tests;
mysql-test/t/im_daemon_life_cycle.imtest:
1. Use wait_for_start.sh script to minimize chance of race condition.
2. Polishing.
mysql-test/t/im_life_cycle.imtest:
1. Use wait_for_start.sh and wait_for_stop.sh scripts to
minimize chance of race condition;
2. Remove some statements, because there is no way now to
stabilize their output.
3. Polishing;
mysql-test/t/im_utils.imtest:
1. Use wait_for_start.sh script to minimize chance of race condition.
2. Polishing.
mysql-test/t/kill_n_check.sh:
1. Make timeout configurable by command-line argument;
2. Change algorithm of waiting for process to restart to be
more robust.
mysql-test/t/im_life_cycle-im.opt:
Set monitoring interval to 1 second in order to:
- be consistent with 5.1;
- speed up tests;
mysql-test/t/im_utils-im.opt:
Set monitoring interval to 1 second in order to:
- be consistent with 5.1;
- speed up tests;
mysql-test/t/wait_for_process.sh:
A new helper script, intended to be used instead of dummy "sleep"
when waiting for some process to start or stop.
into mysql.com:/home/my/mysql-5.1
include/my_sys.h:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_string.cc:
Auto merged
