Bug #25668    - corrected patch after test failures

    Bug #25668    ndb: mysqld may core if cluster disconnected
    -- pTrans may be NULL, remove not needed usage of handler::ndb_err

    Fix a compile error:  Macro "DBUG_ENTER" must not follow an executable statement.

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

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

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

into  bodhi.local:/opt/local/work/mysql-4.1-runtime

into  trift2.:/MySQL/M41/mysql-4.1

into  mysql.com:/home/gluh/MySQL/Merge/5.0

into  mysql.com:/home/gluh/MySQL/Merge/5.0

into  trift2.:/MySQL/M41/push-4.1

  Patch from Paul DuBois for better help messages

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

into  bodhi.local:/opt/local/work/mysql-5.0-runtime

into  bodhi.local:/opt/local/work/mysql-4.1-runtime

into  rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt

           aliases ignored
When a column reference to a column in JOIN USING is resolved and a new 
Item is created for this column the user defined name was lost.
This fix preserves the alias by setting the name of the new Item to the
original alias.

into  mysql.com:/home/kent/bk/tmp2/mysql-5.0-build

  Reverted change for bug#13859, applied smaller patch from Marko

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

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

into  mysql.com:/d2/hf/mr10/my50-mr10

into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0

into  trift2.:/MySQL/M41/push-4.1

into  trift2.:/MySQL/M41/push-4.1

into  olga.mysql.com:/home/igor/mysql-4.1-opt

  Corrected default for --disable-grant-options

into  olga.mysql.com:/home/igor/mysql-5.0-opt

into  mysql.com:/d2/hf/mr10/my50-mr10

  Removed line accidently inserted when correcting bug#18526

into  mysql.com:/d2/hf/mr10/my50-mr10

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

2nd version
During tmp tables cleanup we get the handler for temporary table
and delete table using handler method.

In the method Item_field::fix_fields we try to resolve the name of
the field against the names of the aliases that occur in the select
list. This is done by a call of the function find_item_in_list.
When this function finds several occurrences of the field name
it sends an error message to the error queue and returns 0.
Yet the code did not take into account that find_item_in_list
could return 0 and tried to dereference the returned value.

- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
- configure.js/cmake also updated
- if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
  --bootstrap
  --init-file
  --skip-grant-tables

Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.

For example:

$ export MYSQLD_BOOTSTRAP
$ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
$ mysql_install_db
$ make test

into  olga.mysql.com:/home/igor/mysql-5.0-opt

support-files/MySQL-shared-compat.spec.sh  :    Dummy, irrelevant change - just trigger a new build.