into  riska.(none):/home/sven/bkroot/5.1-bugteam


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

Temporarily checking in an incorrect test case. Rationale: the impact of
this bug is negligible (it's almost a feature request). We need 5.1 to be
stable, and making a real fix is a bit risky. So the fix is postponed
to 6.0.


mysql-test/suite/rpl/r/rpl_ddl.result:
  Updated result file.
mysql-test/suite/rpl/t/disabled.def:
  Enabling test case rpl_ddl.test

The test suite/rpl/t/rpl_innodb_bug28430.test was disabled because of
BUG#32247, but not re-enabled when BUG#32247 was fixed. I've re-enabled
it. The test and result file needed to be updated too.


mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  Updated result file.
mysql-test/suite/rpl/t/disabled.def:
  Enabled the rpl_innodb_bug28430 test case.
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  show slave status is not needed since we have select count(*)

- Disable the "prefer full scan on clustered primary key over full scan
  of any secondary key" rule introduced by BUG#35850.
- Update test results accordingly 
(bk trigger: file this for BUG#35850)


mysql-test/r/innodb.result:
  BUG#35850 "Performance regression in 5.1.23/5.1.24"
  - Update test results
mysql-test/r/innodb_mysql.result:
  BUG#35850 "Performance regression in 5.1.23/5.1.24"
  - Testcase
  - Update test results
mysql-test/r/join_outer_innodb.result:
  BUG#35850 "Performance regression in 5.1.23/5.1.24"
  - Update test results
mysql-test/t/innodb_mysql.test:
  BUG#35850 "Performance regression in 5.1.23/5.1.24"
  - Testcase
sql/sql_select.cc:
  BUG#35850 "Performance regression in 5.1.23/5.1.24"
  - Disable the "prefer full scan on clustered primary key over full scan
    of any secondary key" rule introduced by BUG#35850.

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

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

The problem is that the patch for Bug 33464 didn't update the
results of the test cases which caused the problem.

Dropping a stored routine also revoke privileges for all users
on the stored routine and errors about missing grants are converted
into warnings. Before Bug 33464 such errors could be incorrectly
returned to the user, which would later trigger a assertion due to
multiple errors being set.


mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/ndb_storedproc_06.result:
  Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Add comment regarding bug revealed by test case.
mysql-test/suite/funcs_1/t/disabled.def:
  Re-enable test cases, bug has been fixed.

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam

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 a non-const string pointer.


client/mysqltest.c:
  Don't use a constant string as val may be modified later.

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

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.

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


client/mysqltest.c:
  Auto merged

    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

The problem is a hack in mysqltest.c::append_field that modifies
the exponential notation of floating point numbers by removing a
zero after the the symbol 'e' (eg: 00001.2e+018 is converted to
00001.2e+18) but does not take into account the zerofill affect
in the start of the string.

The solution is to check if the field was zero filled and insert
a zero at the start of the string if a zero after the exponential
notation symbol is removed.


client/mysqltest.c:
  Preserve zerofill affect when removing a zero after
  the exponential notation symbol.

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