into  magare.gmz:/home/kgeorge/mysql/autopush/B36041-5.1-bugteam

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


configure.in:
  merge 5.0-bugteam to 5.1-bugteam

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


mysql-test/t/disabled.def:
  Auto merged

(fix warnings).


libmysqld/lib_sql.cc:
  Use ulonglong to store row count in Protocol_text::remove_last_row()
  (fix warnings).

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


mysql-test/t/disabled.def:
  manual merge

mysql-test/r/group_concat_max_len_func.result:
  Properly restore global group_concat_max_len value at end of test
mysql-test/t/disabled.def:
  Re-disable user_limits test; it is still failing randomly (bug 33696)
mysql-test/t/group_concat_max_len_func.test:
  Update test results

into  hh-nb.hungers:/work/merge/mysql-5.1-build


mysql-test/t/disabled.def:
  Auto merged

into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam

The problem is that since MyISAM's concurrent_insert is on by
default some concurrent SELECT statements might not see changes
made by INSERT statements in other connections, even if the
INSERT statement has returned.

The solution is to disable concurrent_insert so that INSERT
statements returns after the data is actually visible to other
statements.


mysql-test/r/client_xml.result:
  Update test case result.
mysql-test/r/federated.result:
  Update test case result.
mysql-test/r/federated_bug_25714.result:
  Update test case result.
mysql-test/t/client_xml.test:
  Disable concurrent insert and restore old value at the
  end of the test so it doesn't affect other tests.
mysql-test/t/federated.test:
  Disable concurrent insert and restore old value at the
  end of the test so it doesn't affect other tests.
mysql-test/t/federated_bug_25714.test:
  Disable concurrent insert and restore old value at the
  end of the test so it doesn't affect other tests.

into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam

into  hh-nb.hungers:/work/merge/mysql-5.1-build


BitKeeper/deleted/.del-myisam_use_mmap_basic.result:
  Delete: mysql-test/r/myisam_use_mmap_basic.result
BitKeeper/deleted/.del-myisam_use_mmap_basic.test:
  Delete: mysql-test/t/myisam_use_mmap_basic.test

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


mysql-test/suite/rpl/r/rpl_packet.result:
  Auto merged
mysql-test/suite/rpl/t/disabled.def:
  Auto merged
mysql-test/suite/rpl/t/rpl_packet.test:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/suite/rpl/t/disabled.def:
  SCCS merged

into  ramayana.hindu.god:/home/tsmith/m/bk/bugteam/mrg/51

  100% effectively on Windows

The mysqltest docs state that the 'replace_result' command
doesn't perform any escape processing.
However the current implementation was processing backslash 
escapes in the from/to strings.
This prevents replacing e.g. patch on windows (where backslash
is used as a path separator).
Fixed by removing the backslash escape processing from 
'replace_result'.


client/mysqltest.c:
  Bug #36041: remove the escape processing from --replace_result
mysql-test/r/mysqltest.result:
  Bug #36041: test case
mysql-test/t/mysqltest.test:
  Bug #36041: test case

into  ramayana.hindu.god:/home/tsmith/m/bk/bugteam/mrg/51


mysql-test/suite/rpl/r/rpl_packet.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_packet.test:
  Auto merged
mysql-test/suite/rpl/t/disabled.def:
  SCCS merged

Enable back the disabled test case.


mysql-test/include/mix1.inc:
  Fix a race condition in the test, causing a sporadic failure.
mysql-test/r/innodb_mysql.result:
  Update test case result.
mysql-test/t/disabled.def:
  Enable the test case innodb_mysql.
sql/sql_parse.cc:
  Fix the random failure of innodb_mysql test. The failure is not
  random any more after a patch for Bug 12713 added asserts around
  handler commit.

into  amd64.(none):/src/rel_clean_up/my51-rel_clean_up


include/my_global.h:
  Auto merged

into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up

into  amd64.(none):/src/rel_clean_up/my51-rel_clean_up


mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
sql/my_decimal.h:
  Auto merged

into  amd64.(none):/src/rel_clean_up/my51-rel_clean_up

into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up

into  amd64.(none):/src/rel_clean_up/my51-rel_clean_up


mysys/thr_alarm.c:
  Auto merged

into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up

into  host.loc:/work/bk/5.1-bugteam

Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
Bug#36034 - Test parts.part_supported_sql_func_<eng> fails on Windows
Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows

Changeset to fix multiple 5.1.24-rc build bugs on Windows platforms.

Many of these bugs had the same root causes.


mysql-test/mysql-test-run.pl:
  Bug#36034 - Test parts.partition_supported_sql_func_<eng> fails on Windows
  
  Kent suggested these changes to ensure all contents of mysql-test/std_data are copied to std_data_ln on Windows (no symlinks)
mysql-test/suite/funcs_1/datadict/processlist_priv.inc:
  Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
  Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
  
  -reran .result file to account for change in --replace_column calls
mysql-test/suite/funcs_1/r/processlist_priv_ps.result:
  Bug#36032 - Test funcs_1.processlist_priv_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
  
  -reran .result file to account for change in --replace_column calls
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
  Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
  
  Reran .result file to account for changes to --replace_column clauses
mysql-test/suite/funcs_1/r/processlist_val_ps.result:
  Bug#36033 - Test funcs_1.processlist_val_ps fails on Windows
  
  Altered .inc file to include HOST column in the --replace_column clauses.
  
  Windows tests were failing due to use of localhost as localhost:<port> rather than just localhost.
  
  Reran .result file to account for changes to --replace_column clauses
mysql-test/suite/parts/inc/partition_layout_check1.inc:
  Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
  Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
  Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
  Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
  Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows
  
  Added replace_result clause to account for Windows' use of '\r' vs. '\n'
  
  This difference was causing failures on Windows.
  
  Also, mleich added some changes to remove some -ls clauses that weren't necessary
mysql-test/suite/parts/inc/partition_layout_check2.inc:
  Bug#36036 - Test parts.partition_alter1_<eng> fails on Windows
  Bug#36037 - Test parts.partition_alter2_<eng> fails on Windows
  Bug#36038 - Test parts.partition_basic_<engine> failing on Windows
  Bug#36039 - Test parts.partition_engine_<eng> fails on Windows
  Bug#36040 - Test parts.partition_syntax_<eng> fails on Windows
  
  Added replace_result clause to account for Windows' use of '\r' vs. '\n'
  
  This difference was causing failures on Windows.
  
  Also, mleich added some changes to remove some -ls clauses that weren't necessary
mysql-test/suite/parts/r/partition_basic_symlink_myisam.result:
  changes by mleich to remove unneeded use of -ls clause in .result file 
  
  These clauses were removed from partition_layout_check1.inc and partition_layout_check2.inc

                 for ENGINE=MRG_MYISAM (should be optimized out).

Before WL#3281 MERGE engine had the HA_NOT_EXACT_COUNT flag
unset, and it worked with COUNT optimization as desired.
After the removal of the HA_NOT_EXACT_COUNT flag neither
HA_STATS_RECORDS_IS_EXACT (opposite to former HA_NOT_EXACT_COUNT
flag) nor modern HA_HAS_RECORDS flag were not added to MERGE
table flag mask.

1. The HA_HAS_RECORDS table flag has been set.
2. The ha_myisammrg::records method has been overridden to
   calculate total number of records in underlying tables.



storage/myisammrg/myrg_records.c:
  Fixed bug#36006: Optimizer does table scan for select count(*).
  The myrg_records function has been added to calculate total number
  of records in underlying tables.
include/myisammrg.h:
  Fixed bug#36006: Optimizer does table scan for select count(*).
  The myrg_records function declaration has been added.
mysql-test/r/merge.result:
  Added test case for bug#36006.
mysql-test/t/merge.test:
  Added test case for bug#36006.
storage/myisammrg/CMakeLists.txt:
  Fixed bug#36006: Optimizer does table scan for select count(*).
  New myrg_records.c file has been added.
storage/myisammrg/Makefile.am:
  Fixed bug#36006: Optimizer does table scan for select count(*).
  New myrg_records.c file has been added.
storage/myisammrg/ha_myisammrg.cc:
  Fixed bug#36006: Optimizer does table scan for select count(*).
  The ha_myisammrg::records method has been overridden.
storage/myisammrg/ha_myisammrg.h:
  Fixed bug#36006: Optimizer does table scan for select count(*).
  1. The HA_HAS_RECORDS table flag has been set.
  2. The ha_myisammrg::records method has been overridden.

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


sql/sql_select.cc:
  Auto merged

When a zero length is provided to the my_decimal_length_to_precision
function along with unsigned_flag set to false it returns a negative value.
For queries that employs temporary tables may cause failed assertion or
excessive memory consumption while temporary table creation.

Now the my_decimal_length_to_precision and the my_decimal_precision_to_length
functions take unsigned_flag into account only if the length/precision
argument is non-zero.


mysql-test/t/type_decimal.test:
  Added a test case for the bug#36023: Incorrect handling of zero length caused
   an assertion to fail.
mysql-test/r/type_decimal.result:
  Added a test case for the bug#36023: Incorrect handling of zero length caused
   an assertion to fail.
sql/my_decimal.h:
  Bug#36023: Incorrect handling of zero length caused an assertion to fail.
  Now the my_decimal_length_to_precision and the my_decimal_precision_to_length
  functions take unsigned_flag into account only if the length/precision
  argument is non-zero.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build


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

and main: user_limits, concurrent_innodb, lowercase_table3, ctype_create 
tests.


mysql-test/suite/ndb/t/disabled.def:
  Removed test commented.
mysql-test/suite/rpl/t/disabled.def:
  Enabled rpl_view, rpl_ndb_multi, rpl_log_pos tests.
mysql-test/t/disabled.def:
  Enabled user_limits, concurrent_innodb, lowercase_table3, ctype_create tests.

into  hh-nb.hungers:/work/merge/mysql-5.1-build


BitKeeper/etc/ignore:
  auto-union
mysql-test/t/disabled.def:
  Auto merged
BitKeeper/deleted/.del-group_concat_max_len_func.result:
  Delete: mysql-test/r/group_concat_max_len_func.result
BitKeeper/deleted/.del-group_concat_max_len_func.test:
  Delete: mysql-test/t/group_concat_max_len_func.test
BitKeeper/deleted/.del-max_allowed_packet_func.test:
  Delete: mysql-test/t/max_allowed_packet_func.test

BitKeeper/etc/ignore:
  Added mysql-test/r/max_allowed_packet_func.result to the ignore list

into  host.loc:/home/uchum/work/5.1-bugteam


mysql-test/r/subselect.result:
  Merge with 5.0-bugteam (bug#36139).
mysql-test/t/subselect.test:
  Merge with 5.0-bugteam (bug#36139).