into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into mysql.com:/home/hf/work/mysql-5.0.13573


sql/item_func.cc:
  Auto merged

into moonbone.local:/work/14466-bug-5.0-mysql


sql/table.cc:
  Auto merged

  Fixed wrong test case
table.cc:
  Fixed wrong DBUG_ENTER placement


sql/table.cc:
  Fixed wrong DBUG_ENTER placement
mysql-test/r/func_gconcat.result:
  Fixed wrong test case

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0

into moonbone.local:/work/14466-bug-5.0-mysql

into  mysql.com:/my/mysql-5.0

into  mysql.com:/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/table.cc:
  Auto merged

(Fixed failure in rpl0000008.test)

into  mysql.com:/home/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/table.cc:
  Auto merged

 - Add tests


mysql-test/r/ndb_basic.result:
  Add test result
mysql-test/t/ndb_basic.test:
  Add test case

into moonbone.local:/work/14466-bug-5.0-mysql

into mysql.com:/home/hf/work/mysql-5.0.13573


sql/item_func.cc:
  Auto merged

include/my_base.h:
  Move HA_CREATE_FROM_ENGINE to HA_OPTION_CREATE_FROM_ENGINE
sql/ha_ndbcluster.cc:
  Use HA_OPTION_CREATE_FROM_ENGINE
sql/handler.cc:
  Use HA_OPTION_CREATE_FROM_ENGINE

strings/decimal.c:
  here we can run over the buffer - need to check on overflow

into  mysql.com:/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/table.cc:
  Auto merged

into  mysql.com:/my/mysql-5.0

(BDB test failed in Intel64)


mysql-test/r/bdb.result:
  Portability fix
mysql-test/t/bdb.test:
  Portability fix

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysys/base64.c:
  Auto merged

into  mysql.com:/my/mysql-5.0

BUILD/SETUP.sh:
  Use --with-openssl instead of --with-yassl for now
  (We need to fix that libmysqlclient_r links with a -PIC compiled yassl library before enabling yassl)

mysys/base64.c:
  Use unsigned char for d

sql/sql_parse.cc:
  allow query_tables_own_last work correctly
sql/table.cc:
  fixed returning value for libmysqld

into  mysql.com:/my/mysql-5.0

BUILD/SETUP.sh:
  Build with --yassl instead of openssl

into  mysql.com:/my/mysql-5.0

Optimize new pushed code


sql/item_func.cc:
  Fixed wrong merge
sql/sql_update.cc:
  Optimize new pushed code
  (There is no reason to add extra test for not common error case if code can handle it anyway)

into  mysql.com:/home/my/mysql-5.0

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


sql/item_func.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  merge

into mysql.com:/home/hf/work/mysql-5.0.13573


sql/item_func.cc:
  Auto merged

into  krsna.patg.net:/home/patg/mysql-build/mysql-5.0.test2

into  mysql.com:/home/my/mysql-5.0

into  mysql.com:/my/mysql-5.0

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


scripts/mysqld_safe.sh:
  Auto merged

Compile max with --yassl instead of --with-openssl


sql/table.cc:
  Add missing return
BUILD/SETUP.sh:
  Compile max with --yassl instead of --with-openssl