Fixed logic in handler to make handler now show up as enabled.


sql/ha_federated.cc:
  BUG# 15559
  
  Fixed logic in federated_db_init. Also, the query length was being chopped 
  too much breaking the initial select query.

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new2

mysql-test/t/alter_table.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  Manual merge.

into  mysql.com:/usr/local/mysql/mysql-5.1-new

(Backport of an identical change from 5.0)


support-files/mysql.spec.sh:
  We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary.
  The fully static RPM build on "build" also does not work with the bundled zlib.
  With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build")
  and the one already installed on the system for the "max" build which is also labeled "experimental".
  (Backport of an identical change from 5.0)

scripts/make_binary_distribution.sh:
  Auto merged

push didn't push that previous changeset!)


mysql-test/r/mysqlslap.result:
  WORKLOG #2983 removed --help results
mysql-test/t/mysqlslap.test:
  WORKLOG #2983 removed --help from test

into mysql.com:/M50/mysql-5.0


mysql-test/t/alter_table.test:
  Auto merged

  is not defined.


client/mysql.cc:
  Fix missing \n in the --help header when HAVE_READLINE is not defined.

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


client/mysqldump.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


client/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
  Auto merged
client/mysqlshow.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
netware/mysql_test_run.c:
  Merged from 4.1.

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


client/mysql.cc:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
isam/isamchk.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Merged from 4.0.

client/mysql.cc:
  Fixed option name.
client/mysqladmin.c:
  Fixed option name.
client/mysqlbinlog.cc:
  Fixed option name.
client/mysqlcheck.c:
  Fixed option name.
client/mysqldump.c:
  Fixed option name.
client/mysqlimport.c:
  Fixed option name.
client/mysqlshow.c:
  Fixed option name.
isam/isamchk.c:
  Fixed option name.
myisam/myisamchk.c:
  Fixed option name.
myisam/myisampack.c:
  Fixed option name.
sql/sql_parse.cc:
  Fix problem with kill connection on NetWare.

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-slap


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
client/client_priv.h:
  WORKLOG #2983 - conflict hand-merge

  Make __cxa_pure_virtual weak symbol


include/my_global.h:
  Make __cxa_pure_virtual weak symbol

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1


configure.in:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_cache.cc:
  merge
sql/sql_lex.h:
  merge

client/mysqlslap.c:
  WORKLOG #2983 - post review fixes
mysql-test/r/mysqlslap.result:
  WORKLOG #2983 Post review new results due to changes in help text

into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/ha_berkeley.cc:
  Auto merged

into  devsrv-b.mysql.com:/space/magnus/my50-bug11731

into moonbone.local:/work/15028-bug-5.1-new-mysql

  Failing tests func_group func_math group_min_max are disabled


mysql-test/t/disabled.def:
  Failing tests func_group func_math group_min_max are disabled

into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0

into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new1

  Fix help message


sql/mysqld.cc:
  Fix help message

into  devsrv-b.mysql.com:/space/magnus/my50-bug11731

 used instead of column", the bug is to be fixed later.


mysql-test/r/sp.result:
  Test results were fixed (Bug#5967)

into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0


sql/sp_head.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

of SELECT from query begining, to be independet of query buffer
allocation.
Correct procedure used to find beginning of the current statement
during parsing (BUG#14885).


mysql-test/r/view.result:
  BUG#14885 test suite.
mysql-test/t/view.test:
  BUG#14885 test suite.
sql/sp_head.cc:
  The debug print statement fixed to prevent crash in case of NULL
  in m_next_cached_sp.
sql/sql_lex.h:
  Now we shall store only position (index of first character)
  of SELECT from query beginning.
sql/sql_view.cc:
  Position of the SELECT used to output it to .frm.
sql/sql_yacc.yy:
  Now we shall store only position (index of first character)
  of SELECT from query beginning.
  Correct procedure used to find beginning of the current statement
  during parsing.

into moonbone.local:/work/15028-bug-5.1-new-mysql


configure.in:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

  After merge fix


sql/sql_cache.cc:
  After merge fix

into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0


configure.in:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
sql/sql_cache.cc:
  merge

  After merge fix


mysql-test/r/query_cache.result:
  After merge fix

into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/r/sp.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into  devsrv-b.mysql.com:/space/magnus/my50-bug11731

 - Add tests to mysqltest.test
 - Problem no longer exists 


mysql-test/r/mysqltest.result:
  Update result file for new tests
mysql-test/t/mysqltest.test:
  Add tests for bug#11731

mysql-test/r/update.result:
  Auto merged
mysql-test/t/update.test:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
sql/sql_update.cc:
  Auto merged