into  mysql.com:/home/ram/work/b24558/b24558.5.1


sql/field_conv.cc:
  Auto merged
mysql-test/r/type_newdecimal.result:
  merging
mysql-test/t/type_newdecimal.test:
  merging

Altering to a decimal field we get double value then store it 
that may cause data loss. 
Fix: use store_decimal() instead.



mysql-test/r/type_newdecimal.result:
  Fix for bug #24558: Increasing decimal column length causes data loss
    - test result.
mysql-test/t/type_newdecimal.test:
  Fix for bug #24558: Increasing decimal column length causes data loss
    - test case.
sql/field_conv.cc:
  Fix for bug #24558: Increasing decimal column length causes data loss
    - if target field's result type is DECIMAL_RESULT
      use store_decimal(val_decimal()) in order not to loss data.

Duo T7400". Treat such CPU as Xeon. Here's /proc/cpuinfo for T7400:
model name      : Intel(R) Core(TM)2 CPU         T7400  @ 2.16GHz


BUILD/check-cpu:
  Fix for BUG#26971 "BUILD/check-cpu does not recognize Intel Core 2
  Duo T7400". Treat such CPU as Xeon.

into  gbichot4.local:/home/mysql_src/mysql-5.1-maint

Option --no-beep is added to mysqladmin like it already exists in
the "mysql" command-line client (short option: -b; long: --no-beep).
Default is to emit beeps like that "mysql" client.
Can't test in the testsuite; but on my Linux I tested by hand:
open a *xterm* and there do "mysqladmin shutdown" - I hear a beep;
with --no-beep, no beep.


client/mysqladmin.cc:
  new option --no-beep like in mysql.cc: if used, no beeps (ASCII 7, BEL)
  are emitted upon errors. Default is to emit beeps, like mysql.cc.

  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format


mysql-test/t/rpl_ssl.test:
  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format
mysql-test/r/rpl_ssl.result:
  Mask out *_Master_Log_Pos in rpl_ssl test; it varies depending on binlog format

This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)


configure.in:
  Reverse last push (from mysql-5.2 into mysql-5.1)
storage/ndb/src/common/util/version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)

into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2


configure.in:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


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

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Manual merge

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql.cc:
  Auto merged
extra/comp_err.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
BUILD/SETUP.sh:
  Use local

sql/event_data_objects.cc:
  Passing time as time_t to function my_time_t requires
  cast to my_time_t since my_time_t are only required to be 32bits.
sql/log.cc:
  Using time_t instead of my_time_t when calculating current_time.
  This is a potential bugfix for problem with mysql_system_db reporting
  slow log as crashed.
sql/sql_show.cc:
  Passing time as time_t to function my_time_t requires
  cast to my_time_t since my_time_t are only required to be 32bits.

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


extra/comp_err.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


extra/comp_err.c:
  Auto merged

comp_err.c:  return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning


extra/comp_err.c:
  return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint


client/sql_string.h:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51


scripts/make_binary_distribution.sh:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51


scripts/make_binary_distribution.sh:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

sql_servers.cc:insert_server_record():  initialize record[0] before inserting row


sql/sql_servers.cc:
  sql_servers.cc:insert_server_record():  initialize record[0] before inserting row

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50


scripts/make_binary_distribution.sh:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51


mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51


BitKeeper/deleted/.del-bdb_gis.result:
  Use local

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/40

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build