If a binlog file is manually replaced with a namesake directory the internal purging did
not handle the error of deleting the file so that eventually
a post-execution guards fires an assert.

Fixed with reusing a snippet of code for bug@18199 to tolerate lack of the file but no other error 
at an attempt to delete it.
The same applied to the index file deletion.

The cset carries pieces of manual merging.

into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl

into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl

improving a test that shows a failure.

the wait condition was for data in tables but the 
log positions are updates after the data are unlocked.
So there was a time window
[after_table_unlock_for_select, log_pos_updated] where the
orig cond was true but log position might be changed.
the correct one is to expect the last pos of the
slave's insert in the output of show_slave_status on the
master.

refining a test for embedded env.

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

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

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

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

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

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1

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

into  trift2.:/MySQL/M51/push-5.1

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

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

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

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

into  trift2.:/MySQL/M51/push-5.1

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

into  trift2.:/MySQL/M51/push-5.1

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

into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51

into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/50

into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51

into  rhel5-ia64-a.mysql.com:/data0/tsmith/build/51

Fixes:
- Bug #34920: auto_increment resets to 1 on foreign key creation
  We need to use/inherit the passed in autoinc counter for ALTER TABLE
  statements too.

  Post-merge fix (bug #35193).

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

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

Query cache does now work with concurrent_insert=0. See
Bug 33756 - query cache with concurrent_insert=0 appears broken

View definition as SELECT ... FROM DUAL WHERE ... has
valid syntax, but use of such view in SELECT or
SHOW CREATE VIEW syntax causes unexpected syntax error.

Server omits FROM DUAL clause when storing view body
string in a .frm file for further evaluation.
However, syntax of SELECT-witout-FROM query is more
restrictive than SELECT FROM DUAL syntax, and doesn't
allow the WHERE clause.

NOTE: this syntax difference is not documented.


View registration procedure has been modified to
preserve original structure of view's body.

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

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

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

into  stella.local:/home2/mydev/mysql-5.1-axmrg