into  trift2.:/MySQL/M51/push-5.1

into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  synthia.local:/home/mydev/mysql-5.1-axmrg

into  synthia.local:/home/mydev/mysql-5.1-axmrg


mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/sql_insert.cc:
  Auto merged

into  synthia.local:/home/mydev/mysql-5.0-axmrg

into  synthia.local:/home/mydev/mysql-5.0-axmrg

into  synthia.local:/home/mydev/mysql-4.1-axmrg

into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  gleb.loc:/home/uchum/work/bk/5.1-opt


sql/field.cc:
  Auto merged
BitKeeper/deleted/.del-readme.txt~3:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/unireg.h:
  Auto merged
sql/sql_select.cc:
  Merge with main tree.

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  gleb.loc:/home/uchum/work/bk/5.1-opt

Updared to 'views' test - forcing sort order
Updateds included masked results as a result of bug 30322


mysql-test/suite/funcs_1/include/ndb_tb2.inc:
  Correction to test file creating an ndb table
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated resut file - forcing order by
mysql-test/suite/funcs_1/r/ndb_cursors.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_func_view.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_07.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_storedproc_08.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0102.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_03e.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_0407.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_08.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_09.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_trig_1011ext.result:
  updated result file
mysql-test/suite/funcs_1/r/ndb_views.result:
  updated result file
mysql-test/suite/funcs_1/views/views_master.inc:
  updated test file - forcing sort order
mysql-test/suite/funcs_2/r/ndb_charset.result:
  Updated result file

into  trift2.:/MySQL/M51/push-5.1


sql/log_event.cc:
  Auto merged

Completion patch, since it is possible that Log_event::write_header()
is called with no current thread.

When starting the server, there is no thread available, but
MYSQL_BIN_LOG::open() is called to initialize the binary log. The
function writes a format description log event to the binary log,
which means that Log_event::write_header() can be called with no
current thread object available.


sql/log_event.cc:
  Since Log_event::write_header() can be called from inside
  init_server_components(), it is possible that thd is NULL. In this
  case, we set the time of the event to the current time instead
  of the start time of the query.

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  trift2.:/MySQL/M51/push-5.1


sql/log_event.cc:
  Auto merged

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1

Fix for Bug#30274 "Debug server crashes because mutex isn't initialized"

into  trift2.:/MySQL/M51/clone-5.1

mysql-test/suite/funcs_1/r/innodb__datadict.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_func_view.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
  Updated result file
mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory__datadict.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_func_view.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
  Updated result file
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_func_view.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
  Updated result file
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated result file
mysql-test/suite/funcs_1/views/views_master.inc:
  updated test file

  Additional changes for bug#29903
  - Changed to do embedded build part as normal build, when
    WITH_EMBEDDED_SERVER is set.
  - Allow both normal and debug build with embedded.
  - Build static embedded library by pointing out all source and compile
    it all, i.e. not building libraries from libraries, not portable.
  - Let embedded use generated files from the "sql" directory, added
    dependencies to make sure built before embedded.
  - Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
    linked in when debug target is used.
  - Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
    others can't depend on it, not defined at configure time. Instead
    set the output file name.
  - Created work around for bug in CMake 2.4.6 and output names, to
    set the "mysqld<suffix>.pdb" name to the same base name.
  - Set the correct manifest "name" (patch by iggy)


CMakeLists.txt:
  Changes for embedded and Windows
libmysql/CMakeLists.txt:
  Changes for embedded and Windows
libmysqld/CMakeLists.txt:
  Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
  Changes for embedded and Windows
mysys/CMakeLists.txt:
  Changes for embedded and Windows
regex/CMakeLists.txt:
  Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
  Changes for embedded and Windows
sql/CMakeLists.txt:
  Changes for embedded and Windows
storage/archive/CMakeLists.txt:
  Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
  Changes for embedded and Windows
storage/csv/CMakeLists.txt:
  Changes for embedded and Windows
storage/example/CMakeLists.txt:
  Changes for embedded and Windows
storage/federated/CMakeLists.txt:
  Changes for embedded and Windows
storage/heap/CMakeLists.txt:
  Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
  Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
  Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
  Changes for embedded and Windows
strings/CMakeLists.txt:
  Changes for embedded and Windows
vio/CMakeLists.txt:
  Changes for embedded and Windows
win/README:
  Changes for embedded and Windows
win/configure.js:
  Changes for embedded and Windows
win/mysql_manifest.cmake:
  Changes for embedded and Windows

into  magare.gmz:/home/kgeorge/mysql/autopush/B29536-5.0-opt

into  magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt


sql/field.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_timezone.test:
  Bug 29536 : merge 5.0-opt -> 5.1-opt

MySQL replicates the time zone only when operations that involve
it are performed. This is controlled by a flag. But this flag
is set only on successful operation.
The flag must be set also when there is an error that involves
a timezone (so the master would replicate the error to the slaves). 

Fixed by moving the setting of the flag before the operation
(so it apples to errors as well).


mysql-test/r/rpl_timezone.result:
  Bug #29536: test case
mysql-test/t/rpl_timezone.test:
  Bug #29536: test case
sql/field.cc:
  Bug #29536: move setting of the flag before the operation
  (so it apples to errors as well).
sql/time.cc:
  Bug #29536: move setting of the flag before the operation
  (so it apples to errors as well).

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.