mysql-test/r/query_cache_wlock_invalidate_func.result:
  Adjusted test. Query cache doesn't support multiple statements and thus
  using a delimiter change won't work.
mysql-test/t/disabled.def:
  Enabled the query_cache_wlock_invalidate_func test.
mysql-test/t/query_cache_wlock_invalidate_func.test:
  Adjusted test. Query cache doesn't support multiple statements and thus
  using a delimiter change won't work.

into  noir.wlan.koehntopp.de:/misc/mysql/mysql-5.1-bugteam


mysys/my_static.c:
  Auto merged
mysys/my_static.h:
  Auto merged

We could allocate chunks larger than 4GB, but did our size-accounting in 32-bit
values. This could lead to spurious warnings, inaccurate accounting, and, in
theory, data loss.

Affected: 64-bit platforms. Debug-build (with safemalloc). At least one buffer
larger than 4GB. For potential data loss, a re-alloc on such a buffer would be
necessary.


mysys/my_static.c:
  Make memory-accounting 64-bit safe.
mysys/my_static.h:
  Make memory-accounting 64-bit safe.
  Move in struct for better alignment when 64-bit.

    Bug#31237 Test "ndb_views" fails because of differing order of select results


mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated results
mysql-test/suite/funcs_1/views/views_master.inc:
  Mangle the row numbers

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

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


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

into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/BARE/mysql-5.1-bugteam

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-bugteam


client/mysqltest.c:
  Auto merged
dbug/dbug.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
client/mysql_upgrade.c:
  SCCS merged

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-bugteam


client/mysqltest.c:
  Auto merged

client/mysql_upgrade.c:
  Add --tmpdir option to mysql_upgrade and use it when creating temporary files.
mysql-test/mysql-test-run.pl:
  Pass --tmpdir to mysql_upgrade

 - Code in DbugParse was reading from beyond end of the control string


dbug/dbug.c:
  Don't try to parse control strings that hasn't got any tokens
  or is zero size

client/mysqltest.c:
  Use the --tmpdir location to create temporary files

mysql-test/mysql-test-run.pl:
  Use the requested tmpdir in 'collect_mysqld_features', create
  it if it does not already exists

into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs

into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.0-trigs

into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs


client/mysqltest.c:
  Auto merged

into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs


client/mysqltest.c:
  Auto merged

Bug#36028 - Test funcs_1.<engine>_trig_03e failing on Windows
Bug#36029 - Test funcs_1.<engine>_trig_0407 failing on Windows
Bug#36030 - Test funcs_1.<engine>_trig_08 failing on Windows

Adding $MASTER_MYSOCK to init_win_path()
When path names are short, master.sock ends up in MYSQL_TMP_DIR, but with longer path names,
master.sock ends up in /tmp/<random_string>/ and these tests will fail due to path delimiter difference.

New changeset to start with 5.0 -- Not all of these tests are present in 5.0, but want to keep mysqltest the same

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

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

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


configure.in:
  Auto merged

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/B35298-5.1-bugteam


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
configure.in:
  merge 5.0-bugteam to 5.1-bugteam

The bug is a regression introduced by the patch for bug32798.

The code in Item_func_group_concat::clear() relied on the 'distinct'
variable to check if 'unique_filter' was initialized. That, however,
is not always valid because Item_func_group_concat::setup() can do
shortcuts in some cases w/o initializing 'unique_filter'.

Fixed by checking the value of 'unique_filter' instead of 'distinct'
before dereferencing.


mysql-test/r/func_gconcat.result:
  Added test cases for bugs #35298 and #36024.
mysql-test/t/func_gconcat.test:
  Added test cases for bugs #35298 and #36024.
sql/item_sum.cc:
  Check if unique_filter != NULL before dereferencing it. Non-zero value
  of distinct does not always mean that unique_filter is initialized
  because Item_func_group_concat::setup() can do shortcuts is some cases

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  ramayana.hindu.god:/home/tsmith/m/bk/build/50

Select of the test could not perform deterministically, because the table remains to be 
updatable by the running event handler.

Fixed with changing verification to use a logical values instead of comparison 
with a pre-recorded results.


mysql-test/include/rpl_events.inc:
  changing verification to use a logical values instead of comparison with a pre-recorded
  results
mysql-test/suite/rpl/r/rpl_events.result:
  resutls updated.

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