This is a follow up for the patch for Bug#26162 "Trigger DML ignores low_priority_updates setting", where the stored procedure ignores the session setting of low_priority_updates.


sql/lock.cc:
  Add late lock_type assertion.
sql/sql_base.cc:
  Possibly downgrade lock type to the the session setting of low_priority_updates and also remove early assertion.

mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.

This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).


mysql-test/r/lock_multi.result:
  Bug#25856 test result
mysql-test/t/lock_multi.test:
  Bug#25856 test case
sql/sql_handler.cc:
  Move the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close.

sql/log_event.h:
  Add doxygen documentation.
  Restore a text which had no influence on doxygen.

sql/field.h:
  Fix doxygen warnings - too complex return value type, it choked on it.
sql/field_conv.cc:
  Fix doxygen warnings - too complex return value type, it choked on it.

sql/event_data_objects.cc:
  Add module comments.
sql/event_data_objects.h:
  Add module comments.
sql/event_db_repository.cc:
  Add module comments.
sql/event_db_repository.h:
  Add module comments.
sql/event_queue.cc:
  Add module comments.
sql/event_queue.h:
  Add module comments.
sql/event_scheduler.cc:
  Add module comments.
sql/event_scheduler.h:
  Add module comments.
sql/events.cc:
  Add module comments.
sql/events.h:
  Add module comments.
sql/lock.cc:
  Add module comments.
sql/sp_head.h:
  Add module comments.
sql/sql_base.cc:
  Add module comments.
sql/sql_lex.h:
  Add module comments.
sql/sql_parse.cc:
  Add module comments.
sql/sql_select.cc:
  Add module comments.
sql/sql_yacc.yy:
  Add module comments.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime

client/mysqldump.c:
  Fix doxygen warnings
mysys/test_charset.c:
  Fix doxygen warnings
sql/event_db_repository.cc:
  Fix doxygen warnings
sql/events.cc:
  Fix doxygen warnings
sql/events.h:
  Fix doxygen warnings
sql/item_create.cc:
  Fix doxygen warnings, style.
sql/item_create.h:
  Fix coding style.
sql/item_subselect.cc:
  Fix doxygen warnings
sql/lock.cc:
  Fix doxygen warnings
sql/sp.cc:
  Fix doxygen warnings
sql/sp_head.h:
  Fix doxygen warnings
sql/sql_analyse.cc:
  Fix doxygen warnings
sql/sql_analyse.h:
  Fix doxygen warnings
sql/sql_base.cc:
  Fix doxygen warnings
sql/sql_db.cc:
  Fix doxygen warnings
sql/sql_lex.cc:
  Fix doxygen warnings
sql/sql_lex.h:
  Fix doxygen warnings
sql/sql_parse.cc:
  Fix doxygen warnings
sql/sql_plugin.cc:
  Fix doxygen warnings
sql/sql_prepare.cc:
  Fix doxygen warnings
sql/sql_show.cc:
  Fix doxygen warnings
sql/sql_trigger.cc:
  Fix doxygen warnings
sql/sql_update.cc:
  Fix doxygen warnings
sql/table.h:
  Fix doxygen warnings

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-cleanup

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime

The patch changes the test case only.
The fix is to replace all 'sleep's with wait_condition. This makes
the test deterministic and also ~300 times faster.


mysql-test/r/lock_multi.result:
  Update result.
mysql-test/t/lock_multi.test:
  A fix for Bug#29049 lock_multi fails in rare case.
  Replace all 'sleep's with wait_condition. This makes
  the test deterministic and also ~300 times faster.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime

Make the test deterministic.


mysql-test/r/events_logs_tests.result:
  Update results (Bug#30212)

           ANSI_QUOTES mode)

This patch contains a test case only, showing that the bug has been fixed.

The issue was related to parsing <"blah">, where the lexical analyser
would not properly delimit the start and end of the token.

Properly making the token boundaries has been fixed in sql_lex.cc
with the patch for bug 25411 : see the Lex_input_stream class.


mysql-test/r/parser.result:
  Test case for Bug#25930, which was fixed by Bug#25411
mysql-test/t/parser.test:
  Test case for Bug#25930, which was fixed by Bug#25411

mysql-test/r/log_state.result:
  Update results (Bug#28830)
mysql-test/t/log_state.test:
  A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due 
  to loaded system - make the test more deterministic.

during "CREATE ... LIKE ..."
Only affects engine writers.
No change in server behaviour.


sql/table.cc:
  Apply patch for Bug#27806 table comments not passed in to storage engine 
  during "CREATE ... LIKE ..."

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/item.cc:
  Auto merged
tests/mysql_client_test.c:
  Manual merge.

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime


client/mysqldump.c:
  Auto merged
mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/item.cc:
  Auto merged

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime

VIEW".

mysql_list_fields() C API function would incorrectly set MYSQL_FIELD::decimals
member for some view columns.

The problem was in an incomplete implementation of 
Item_ident_for_show::make_field(), which is responsible for view
columns metadata.


sql/item.cc:
  A fix for Bug#29306 -- properly initialize decimals in 
  Item_ident_for_show::make_field
tests/mysql_client_test.c:
  Add a test case forBug#29306. Fix warnings.

into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new


scripts/make_win_bin_dist:
  Auto merged

  Corrected install path


scripts/make_win_bin_dist:
  Corrected install path

  Copy embedded .pdb and static debug lib


scripts/make_win_bin_dist:
  Copy embedded .pdb and static debug lib

into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new


mysql-test/mysql-test-run.pl:
  SCCS merged

  Search "relwithdebinfo" directory in CMake Visual Studio build
  Search for "mysqld-debug" even in source tree


mysql-test/mysql-test-run.pl:
  Search "relwithdebinfo" directory in CMake Visual Studio build
  Search for "mysqld-debug" even in source tree

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build

when its statement being KILLed". The bug itself was fixed by separate
patch in 5.0 tree.


mysql-test/r/lock_multi.result:
  Added test for bug #21281 "Pending write lock is incorrectly removed
  when its statement being KILLed".
mysql-test/t/lock_multi.test:
  Added test for bug #21281 "Pending write lock is incorrectly removed
  when its statement being KILLed".

into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg21281-2


mysql-test/t/federated.test:
  Auto merged
mysys/thr_lock.c:
  Auto merged
mysql-test/r/federated.result:
  SCCS merged