into  mysql.com:/usr/home/ram/work/mysql-5.1-maint

into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge

into  siva.hindu.god:/usr/home/tim/m/bk/51

into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint

Bug#21011 The [client] group header was overwritten by "password" option in upgrade_defaults file which confused mysqlcheck thus used to prevent the whole thing from running correctly when the "--password=" option is specified on mysql_upgrade command line with no corresponding "--user=" option

initialized prior to usage as well as deinitialized on shutdown.

into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug21424/my51-bug21424

Bug#21424 mysqldump failing to export/import views.                                                                                                                                                                  

Dumps are created for the tables in each specified database then for the views in each specified database. This bug occurs when any database's views depend on the mysql database's table data while being restored. 
Added command line option --flush-privileges to the mysqldump utility which causes a FLUSH PRIVILIGES statement to be written to the dump after the mysql database.

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my51-bksendmailfix

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug21618/my51-bug21618

5.1.12.

into  siva.hindu.god:/usr/home/tim/m/bk/tmp/51-mrg50

- Remove extra EXTRA_DIST from several Makefile.ams
- Add dummy primary key to test table in loaddata_autocom.inc

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx

The column's NOT NULL flag doesn't affect what we should print.  Remove the
wrong logic that does check it.

Also, verify that this and the previous two tests print the same data as 
other output formats.

  fix sigsegv

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

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

into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-maint

into  maint1.mysql.com:/data/localhome/cmiller/bug15583/my51-bug15583

into  lamia.home:/home/timka/mysql/src/5.1-dbg

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx

into  polly.local:/tmp/20924/bug20294/my51-bug20294

into  polly.local:/tmp/20924/bug20294/my50-bug20294

Cset exclude: kaa@polly.local|ChangeSet|20060908100829|09983

into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/51

into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx

into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg/51

The cause of the bug was an incomplete fix for bug 18080.
The problem was that setup_tables() unconditionally reset the
name resolution context to its 'tables' argument, which pointed
to the first table of an SQL statement.

The bug fix limits resetting of the name resolution context in
setup_tables() only in the cases when the context was not set
by earlier parser/optimizer phases.

Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work