into  five.local.lan:/work/trees/mysql-5.0-build-src-clean

mysql-test/Makefile.am   :    Fix a copy-paste error ...

into  five.local.lan:/work/merge/mysql-5.0-build

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

When linking with some external programs, "multiple definition 
of `init_time'"

Rename init_time() to my_init_time() to avoid collision with other
libraries (particularly libmng).

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

into  trift2.:/MySQL/M50/push-5.0

into  five.local.lan:/work/trees/mysql-5.0-build-src-clean

"funcs_1" data load

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

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

into  five.local.lan:/work/trees/mysql-5.0-build-src-clean

into  five.local.lan:/work/trees/mysql-5.0-build-src-clean

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge

   Bug#35335 funcs_1: Some tests fail within load_file during
                      pushbuild runs
   Solution: 1. Move files with input data used in load_file, 
                load data etc. 
                from suite/funcs_1/<whatever>
                to std_data
             2. Use for testsuite funcs_1 the server option
                --secure-file-priv=<MYSQLTEST_VARDIR>
             3. Outfiles have to be stored under MYSQLTEST_VARDIR 
+ changes according to WL#4304 Cleanup in funcs_1 tests
  - backport of fixes/improvements made in 5.1 to 5.0
    The differences between scripts in 5.0 and 5.1 cause
    much additional and annoying work during any upmerge.
  - replace error numbers with names
  - improved comments
  - improved formatting
  - Unify storage engine names so that result files for
    storage engine variants do not differ (some tests)
  - remove a script no more used (tests are done in other scripts)

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge

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

  1. Use 'dat' extension, because it is handled in Makefile.am;
  2. Fix typo: the bug id is 35469, not 35649.

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

into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-bt

- Backported the 5.1 DBUG to 5.0.
- Avoid memory cleanup race on Windows client for CTRL-C

The problem was that LOAD DATA code (sql_load.cc) didn't take into
account that there may be items, representing references to other
columns. This is a usual case in views. The crash happened because
Item_direct_view_ref was casted to Item_user_var_as_out_param,
which is not a base class.

The fix is to
  1) Handle references properly;
  2) Ensure that an item is treated as a user variable only when
     it is a user variable indeed;
  3) Report an error if LOAD DATA is used to load data into
     non-updatable column.

into  witty.:/Users/mattiasj/clones/bug21413-50-bugteam

into  witty.:/Users/mattiasj/clones/bug21413-50-engines

            in REPLACE DELAYED
    
post push patch, removing the optimization for
copying delayed_insert variables.

into  moonbone.local:/work/27219-5.0-opt-mysql

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

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

into  mysql.com:/misc/mysql/mysql-5.0-opt

Mixing aggregate functions and non-grouping columns is not allowed in the
ONLY_FULL_GROUP_BY mode. However in some cases the error wasn't thrown because
of insufficient check.

In order to check more thoroughly the new algorithm employs a list of outer
fields used in a sum function and a SELECT_LEX::full_group_by_flag.
Each non-outer field checked to find out whether it's aggregated or not and
the current select is marked accordingly.
All outer fields that are used under an aggregate function are added to the
Item_sum::outer_fields list and later checked by the Item_sum::check_sum_func
function.

into  host.loc:/home/uchum/work/5.0-opt

into  witty.:/Users/mattiasj/clones/bug21413-50-engines

Fixed interference between tests: Users were added but not properly removed.
This caused later tests to fail.