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

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1

into  production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.1


scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Merge changes from 5.0

CMakeLists.txt:
  BUG#20815 do not use 10MB of stack space per thread, enforce the previous 5.0 default of 1M

  - make the 'dist-hook' from top-level Makefile work again.
  - we can find my_print_defaults from --basedir by parsing command
    line arguments prior to running my_print_defaults.
  - take advantage of additional command line parsing and allow the
    --no-defaults etc arguments to work anywhere rather than having
    to be the first argument.
  - find SQL files either from binary archive or source install.
  - consolidate and tidy code and error messages.


scripts/mysql_install_db.sh:
  Consolidate error messages.

into  mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.1-engines


storage/myisam/mi_extra.c:
  Auto merged
mysql-test/r/alter_table.result:
  Manual merge
mysql-test/t/alter_table.test:
  Manual merge

into  mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-engines

INSERT/DELETE/UPDATE followed by ALTER TABLE within LOCK TABLES
may cause table corruption on Windows.

That happens because ALTER TABLE writes outdated shared state
info into index file.

Fixed by removing obsolete workaround.

Affects MyISAM tables on Windows only.


myisam/mi_extra.c:
  On windows when mi_extra(HA_EXTRA_PREPARE_FOR_DELETE) is called,
  we release external lock and close index file. If we're in LOCK
  TABLES, MyISAM state info doesn't get updated until UNLOCK TABLES.
  
  That means when we release external lock and we're in LOCK TABLES,
  we may write outdated state info.
  
  As SQL layer closes all table instances, we do not need this
  workaround anymore.
mysql-test/r/alter_table.result:
  A test case for BUG#29957.
mysql-test/t/alter_table.test:
  A test case for BUG#29957.

into  debian.(none):/M51/push-5.1

into  debian.(none):/M51/rowlock-5.1


BitKeeper/deleted/.del-readme.txt~3:
  Merge rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt~3
Makefile.am:
  Manual merge: "row_lock" suite is deleted.

For more information, see WL#3866 and the bugs numbered 28685 and 20390.


BitKeeper/deleted/.del-readme.txt:
  Delete: mysql-test/suite/row_lock/readme.txt
BitKeeper/deleted/.del-summary_of_sel_test.txt:
  Delete: mysql-test/suite/row_lock/summary_of_sel_test.txt
BitKeeper/deleted/.del-innodb_row_lock_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_1.result
BitKeeper/deleted/.del-innodb_row_lock_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_2.result
BitKeeper/deleted/.del-innodb_row_lock_3.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_3.result
BitKeeper/deleted/.del-innodb_row_lock_4.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_4.result
BitKeeper/deleted/.del-innodb_row_lock_5.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_5.result
BitKeeper/deleted/.del-innodb_row_lock_big_tab.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab.result
BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_1.result
BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_big_tab_2.result
BitKeeper/deleted/.del-innodb_row_lock_trig_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_1.result
BitKeeper/deleted/.del-innodb_row_lock_trig_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_trig_2.result
BitKeeper/deleted/.del-innodb_row_lock_view_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_1.result
BitKeeper/deleted/.del-row_lock.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock.inc
BitKeeper/deleted/.del-row_lock_big_tab.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_big_tab.inc
BitKeeper/deleted/.del-row_lock_big_tab_1.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_1.inc
BitKeeper/deleted/.del-row_lock_big_tab_2.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_big_tab_2.inc
BitKeeper/deleted/.del-row_lock_trig.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_trig.inc
BitKeeper/deleted/.del-row_lock_view.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_view.inc
BitKeeper/deleted/.del-row_lock_view_mix.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_view_mix.inc
BitKeeper/deleted/.del-row_lock_view_storedp.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_view_storedp.inc
BitKeeper/deleted/.del-row_lock_view_trig.inc:
  Delete: mysql-test/suite/row_lock/include/row_lock_view_trig.inc
BitKeeper/deleted/.del-innodb_row_lock_view_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_2.result
BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_1.result
BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_mix_2.result
BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_1.result
BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_storedp_2.result
BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_1.result
BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.result:
  Delete: mysql-test/suite/row_lock/r/innodb_row_lock_view_trig_2.result
BitKeeper/deleted/.del-ndb_row_lock_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_1.result
BitKeeper/deleted/.del-ndb_row_lock_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_2.result
BitKeeper/deleted/.del-ndb_row_lock_3.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_3.result
BitKeeper/deleted/.del-ndb_row_lock_4.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_4.result
BitKeeper/deleted/.del-ndb_row_lock_5.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_5.result
BitKeeper/deleted/.del-ndb_row_lock_big_tab.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab.result
BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_1.result
BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_big_tab_2.result
BitKeeper/deleted/.del-ndb_row_lock_trig_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_1.result
BitKeeper/deleted/.del-ndb_row_lock_trig_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_trig_2.result
BitKeeper/deleted/.del-ndb_row_lock_view_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_1.result
BitKeeper/deleted/.del-ndb_row_lock_view_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_2.result
BitKeeper/deleted/.del-innodb_row_lock_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_1.test
BitKeeper/deleted/.del-innodb_row_lock_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_2.test
BitKeeper/deleted/.del-innodb_row_lock_3.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_3.test
BitKeeper/deleted/.del-innodb_row_lock_4.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_4.test
BitKeeper/deleted/.del-innodb_row_lock_5.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_5.test
BitKeeper/deleted/.del-innodb_row_lock_big_tab.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab.test
BitKeeper/deleted/.del-innodb_row_lock_big_tab_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_1.test
BitKeeper/deleted/.del-innodb_row_lock_big_tab_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_big_tab_2.test
BitKeeper/deleted/.del-innodb_row_lock_trig_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_1.test
BitKeeper/deleted/.del-innodb_row_lock_trig_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_trig_2.test
BitKeeper/deleted/.del-innodb_row_lock_view_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_1.test
BitKeeper/deleted/.del-innodb_row_lock_view_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_2.test
BitKeeper/deleted/.del-innodb_row_lock_view_mix_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_1.test
BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_1.result
BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_mix_2.result
BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_1.result
BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_storedp_2.result
BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_1.result
BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.result:
  Delete: mysql-test/suite/row_lock/r/ndb_row_lock_view_trig_2.result
BitKeeper/deleted/.del-innodb_row_lock_view_mix_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_mix_2.test
BitKeeper/deleted/.del-innodb_row_lock_view_storedp_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_1.test
BitKeeper/deleted/.del-innodb_row_lock_view_storedp_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_storedp_2.test
BitKeeper/deleted/.del-innodb_row_lock_view_trig_1.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_1.test
BitKeeper/deleted/.del-innodb_row_lock_view_trig_2.test:
  Delete: mysql-test/suite/row_lock/t/innodb_row_lock_view_trig_2.test
BitKeeper/deleted/.del-ndb_row_lock_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_1.test
BitKeeper/deleted/.del-ndb_row_lock_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_2.test
BitKeeper/deleted/.del-ndb_row_lock_3.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_3.test
BitKeeper/deleted/.del-ndb_row_lock_4.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_4.test
BitKeeper/deleted/.del-ndb_row_lock_5.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_5.test
BitKeeper/deleted/.del-ndb_row_lock_big_tab.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab.test
BitKeeper/deleted/.del-ndb_row_lock_big_tab_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_1.test
BitKeeper/deleted/.del-ndb_row_lock_big_tab_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_big_tab_2.test
BitKeeper/deleted/.del-ndb_row_lock_trig_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_1.test
BitKeeper/deleted/.del-ndb_row_lock_trig_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_trig_2.test
BitKeeper/deleted/.del-ndb_row_lock_view_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_1.test
BitKeeper/deleted/.del-ndb_row_lock_view_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_2.test
BitKeeper/deleted/.del-ndb_row_lock_view_mix_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_1.test
BitKeeper/deleted/.del-ndb_row_lock_view_mix_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_mix_2.test
BitKeeper/deleted/.del-ndb_row_lock_view_storedp_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_1.test
BitKeeper/deleted/.del-ndb_row_lock_view_storedp_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_storedp_2.test
BitKeeper/deleted/.del-ndb_row_lock_view_trig_1.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_1.test
BitKeeper/deleted/.del-ndb_row_lock_view_trig_2.test:
  Delete: mysql-test/suite/row_lock/t/ndb_row_lock_view_trig_2.test
Makefile.am:
  Remove the "row_lock" suite from the "test-bt" target.
  
  Also, a formatting change: empty line for better readability.

into  xiphis.org:/anubis/antony/work/mysql-5.1-engines.merge

into  xiphis.org:/anubis/antony/work/mysql-5.1-engines.merge

into  xiphis.org:/anubis/antony/work/mysql-5.0-engines.merge

into  debian.(none):/M51/push-5.1

into  debian.(none):/M51/push-5.1


sql/sql_parse.cc:
  Auto merged

into  debian.(none):/M51/bug16635-5.1

into  debian.(none):/M50/bug16635-5.0


BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged

  Fix error in previous change, correct --language argument.


scripts/mysql_install_db.sh:
  Fix error in previous change, correct --language argument.

scripts/mysql_install_db.sh:
  Put back variable initialisation for those which could be passed
  in via the environment and confuse the script.

available and reduce the chance of failure.  This should fix bug#28585
which is caused by the script being quite random in how it finds files it
requires and not giving very good feedback to the user about what went
wrong.

Also update make_binary_distribution so that it provides the correct path
to the required SQL scripts when generating mysql_install_db.  The script
only previously worked because of the permissive behaviour which looked
around the current working directory before the "correct" location.  This
could lead to severe problems if the user happened to run the script from
a location which contained older or even broken copies of the SQL scripts.

We now require either a complete binary release (and the mysql_install_db
script ran from inside the extracted archive), or an installed compiled
tree, as this is the only way we can be sure everything that we need is
available and ready to run.

While working on this fix, also clean up the mysql_install_db script a lot
to make it simpler, easier to read, and hopefully less prone to bugs in
the future.


scripts/make_binary_distribution.sh:
  SQL files live in ./share not ./support-files in binary distribution.
scripts/mysql_install_db.sh:
  Use a consistent shell indentation style.

to 150 or 107 characters for those messages which are generated
by the embedded server during release builds.

This fixes bug#16635:
   Error messages wrong: absolute path names, "%s" format code

See the bug report or the changelog for "sql/share/english/errmsg.txt"
for instructions how to do that with other languages, 
even at the customer site, and for the restrictions to keep.


sql/share/english/errmsg.txt:
  The embedded server uses absolute path names in its error messages,
  in the release build environment these exceed the 64 character limit
  which the format strings for the error messages impose (bug#16635).
  
  But when the messages are output, the server does the "printf()" 
  internally in a 256 character buffer; the constant text and the
  expanded variables (strings, error number) must fit into this.
  
  (If the buffer would overflow, a format specification will not be
  expanded but just copied with its code, and the message output
  will just contain '%s' or '%d' where a value is expected.)
  
  So the string lengths are increased to 150 characters in those messages
  which are issued by the embedded server during release tests
  and contain 1 (one) path name,
  but only to 107 in the "rename" message which contains 2 (two).
  
  This solves bug#16635 for the release builds.
  
  For other languages used by OEM customers, similar fixes may be needed,
  but we cannot test them.
  
  These fixes can be done even in a binary installation at the customer site
  by following these steps:
     cd <<install-root>>/share
     $EDITOR <<lang>>/errmsg.txt
     ../../bin/comp_err -C./charsets/ <<lang>>/errmsg.txt <<lang>>/errmsg.sys
  and then restarting the server.

into  pcg5ppc.xiphis.org:/Users/antony/Work/p1-bug29522.1

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/t/create.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/create.result:
  Merge with 5.0-opt.

into  xiphis.org:/anubis/antony/work/p2-bug25679.3.merge-5.1


storage/federated/ha_federated.cc:
  Auto merged

sql/ha_federated.cc:
  remote_error_number is set to -1 when an error was already reported
  with my_error(). ER(-1) will also cause a crash on 64bit arch and only
  worked on 32bit arch by luck

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/create.result:
  Merge with 5.1 (main).

  Post-merge fix.


sql/sql_select.cc:
  Post-merge fix.
sql/table.cc:
  Post-merge fix.

  Post-merge fix.


sql/sql_select.cc:
  Post-merge fix.

  "log.cc:1448: failed assertion `mysql_bin_log.is_open() && rex_data->empty()'"
  When Federated's transaction support was disabled by bug29875,
  this assertion became unreproducable.


mysql-test/t/disabled.def:
  bug29522
    reenable federated_innodb test

into  gleb.loc:/home/uchum/work/bk/5.0-opt


mysql-test/t/create.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/create.result:
  Merge with 5.0 (main).

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/having.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/having.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Merge with 5.0-opt.
mysql-test/r/create.result:
  Merge with 5.0-opt.
mysql-test/r/innodb_mysql.result:
  Merge with 5.0-opt.
mysql-test/r/type_enum.result:
  Merge with 5.0-opt.
mysql-test/t/type_enum.test:
  Merge with 5.0-opt.
sql/filesort.cc:
  Merge with 5.0-opt.
sql/sql_base.cc:
  Merge with 5.0-opt.
sql/table.cc:
  Merge with 5.0-opt.
storage/innobase/handler/ha_innodb.cc:
  Merge with 5.0-opt.

into  xiphis.org:/anubis/antony/work/p2-bug25679.3.merge-5.1


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
storage/federated/ha_federated.h:
  Auto merged
storage/federated/ha_federated.cc:
  manual merge 5.0 to 5.1

  "Federated Denial of Service"
  Federated storage engine used to attempt to open connections within
  the ::create() and ::open() methods which are invoked while LOCK_open
  mutex is being held by mysqld. As a result, no other client sessions
  can open tables while Federated is attempting to open a connection.
  Long DNS lookup times would stall mysqld's operation and a rogue
  connection string which connects to a remote server which simply
  stalls during handshake can stall mysqld for a much longer period of
  time.
  This patch moves the opening of the connection much later, when the
  federated actually issues queries, by which time the LOCK_open mutex is
  no longer being held.


mysql-test/r/federated.result:
  change of test/results due to patch for bug25679
mysql-test/t/federated.test:
  change of test/results due to patch for bug25679
sql/ha_federated.cc:
  bug25679
    remove function check_foreign_fata_source()
    ha_federated::open() no longer opens the federated connection.
    ha_federated::create() no longer opens and tests connection.
    ha_federated::real_connect() opens connection and tests presence of table.
    ha_federated::real_query() sends query, calling real_connect() if neccessary.
sql/ha_federated.h:
  bug25679
    new methods real_query() and real_connect()

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  mysql.com:/home/svoj/devel/mysql/BUG29806/mysql-5.1-engines


sql/ha_ndbcluster.cc:
  Auto merged
sql/lock.cc:
  Auto merged

Stopping mysql server could result in an entry in mysql error
file: "InnoDB: Error: MySQL is freeing a thd".

This happened because InnoDB assumes that the server will never
call external_lock(F_UNLCK) in case external_lock(READ/WRITE)
failed.

Prior to this patch we haven't had strict definition whether
external_lock(F_UNLCK) must be called in case external_lock(READ/WRITE)
fails.

This patch states that we never call external_lock(F_UNLCK) in case
external_lock(READ/WRITE) fails.


mysql-test/suite/binlog/t/disabled.def:
  Re-enabled binlog_innodb and binlog_killed tests.
sql/ha_ndbcluster.cc:
  Restore handler state in case external_lock() failed.
sql/ha_partition.cc:
  Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed.
sql/lock.cc:
  Do not call external_lock(F_UNLCK) in case external_lock(READ/WRITE) failed.
storage/myisammrg/myrg_locking.c:
  Restore handler state in case external_lock() failed.

for enabling threads.  However, duplicate AC_PROG_* macros in the
innobase plug.in file were resetting $CC and causing link errors.

As AC_PROG_* macros are already used in the main configure.in file
there should be no need for them to be duplicated here too.


storage/innobase/plug.in:
  Remove AC_PROG_* macros

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime

into  bodhi.(none):/opt/local/work/mysql-5.1-runtime