Problem: we don't take into account the length of the data written
to the temporary data file during update on a CSV table.

Fix: properly calculate the data file length during update.


mysql-test/r/csv.result:
  Fix for bug #29652: csv.test failure: two changes conflict after merge
    - test result adjusted.
storage/csv/ha_tina.cc:
  Fix for bug #29652: csv.test failure: two changes conflict after merge
    - adjust local_saved_data_file_length in case of update as well.
storage/csv/ha_tina.h:
  Fix for bug #29652: csv.test failure: two changes conflict after merge
    - adjust local_saved_data_file_length in case of update as well.

into  sita.local:/Users/tsmith/m/bk/maint/51


sql/log.cc:
  Auto merged

into  sita.local:/Users/tsmith/m/bk/maint/51


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged

into  sita.local:/Users/tsmith/m/bk/maint/50

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

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


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

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


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  manual merge

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


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log_event.cc:
  manual merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint

  post-merge fix: re-enable rpl_udf test


mysql-test/suite/rpl/t/disabled.def:
  post-merge fix: re-enable rpl_udf test

into  sita.local:/Users/tsmith/m/bk/maint/51

This merge requires a post-merge fix to remove rpl_udf from
suite/rpl/t/disabled.def.


mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_dd_basic.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_dd_ddl.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_gis.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_row_format.result:
  Auto merged
mysql-test/suite/ndb/r/ndb_single_user.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_single_user.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_incident.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_sp.result:
  Auto merged
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/csv.result:
  Manual merge
mysql-test/t/csv.test:
  Manual merge
mysql-test/t/disabled.def:
  Manual merge

into  sita.local:/Users/tsmith/m/bk/maint/50

- correct result files

into  sita.local:/Users/tsmith/m/bk/maint/50


sql/log.cc:
  Auto merged

into  sita.local:/Users/tsmith/m/bk/maint/41

into  sita.local:/Users/tsmith/m/bk/maint/50

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


sql/mysqld.cc:
  Auto merged
sql/unireg.h:
  Auto merged
mysql-test/t/show_check.test:
  merging
sql/sql_parse.cc:
  merging

into  mysql.com:/home/ram/work/b28808/b28808.5.0

into  sita.local:/Users/tsmith/m/bk/maint/50

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

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

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt


sql/field.cc:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Manual merge
sql/item_create.cc:
  Manual merge
mysql-test/t/type_newdecimal.test:
  Manual merge.

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29417


mysql-test/r/type_newdecimal.result:
  Manual merge.
mysql-test/t/type_newdecimal.test:
  Manual merge.

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

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


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/include/mix1.inc:
  Merge with 5.0-opt.

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

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


mysql-test/r/innodb_mysql.result:
  Auto merged
sql/sql_partition.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Merge with 5.1 (main).

An assertion abort could occur for some grouping queries that employed 
decimal user variables with assignments to them.

The problem appeared the constructors of the class Field_new_decimal
because the function my_decimal_length_to_precision did not guarantee
returning decimal precision not greater than DECIMAL_MAX_PRECISION.


mysql-test/r/type_newdecimal.result:
  Added a test case for bug #29417.
mysql-test/t/type_newdecimal.test:
  Added a test case for bug #29417.
sql/field.cc:
  Fixed bug #29417.
  An assertion abort could occur for some grouping queries that employed 
  decimal user variables with assignments to them.
  
  The problem appeared the constructors of the class Field_new_decimal
  because the function my_decimal_length_to_precision did not guarantee
  returning decimal precision not greater than DECIMAL_MAX_PRECISION.
  
  Now if the precision returned by calls to my_decimal_length_to_precision
  in the constructors of the class Field_new_decimal is greater than 
  DECIMAL_MAX_PRECISION the precision is set to this value.

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


mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Merge with 5.0 (main).

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

The cast operation ignored the cases when the precision and/or the scale exceeded
the limits, 65 and 30 respectively. No errors were reported in these cases.
For some queries this may lead to an assertion abort.

Fixed by throwing errors for such cases.


mysql-test/r/type_newdecimal.result:
  Added a test case for bug #29415.
mysql-test/t/type_newdecimal.test:
  Added a test case for bug #29415.

into  anubis.xiphis.org:/usr/home/antony/work/mysql-5.1-engines.merge

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


mysql-test/r/gis.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/loaddata.test:
  Auto merged
sql/item.h:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/r/loaddata.result:
  Merge with 5.0-opt.
mysql-test/t/view.test:
  Merge with 5.0-opt.

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


sql/sql_repl.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_rotate_logs.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_rotate_logs.test:
  Auto merged

into  ymer.(none):/usr/local/mysql/mysql-5.1-engines


sql/stacktrace.c:
  Auto merged
BUILD/compile-pentium-gcov:
  Manual merge.

For GCov builds, if the server crashes, the normal exit handler for writing
coverage information is not executed due to the abnormal termination.

Fix this by explicitly calling the __gcov_flush function in our crash handler.