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


mysql-test/mysql-test-run.pl:
  Auto merged
client/mysqltest.c:
  Manual merge, will add ramils patch afterwards

 - Part2, actually adding the new functionality


client/mysqltest.c:
  adding the new functionality run with views, cursor and stored procedures
mysql-test/mysql-test-run.pl:
  Adding new switches

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

  Additional fix for bug#14093


sql/opt_range.cc:
  Additional fix for bug#14093

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

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

into  mysql.com:/opt/local/work/mysql-5.0-14210


sql/handler.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged

large table gives server crash": make sure that when a MyISAM temporary
table is created for a cursor, it's created in its memory root,
not the memory root of the current query.


mysql-test/r/sp.result:
  Test results fixed: a test case for Bug#14210
mysql-test/t/sp.test:
  A test case for Bug#14210 "Simple query with > operator on large table 
  gives server crash"
sql/handler.cc:
  - rewrite get_new_handler to accept a memory root and use it for
sql/handler.h:
  - get_new_handler declaration changed
sql/opt_range.cc:
  - get_new_handler declaration changed
sql/sql_base.cc:
  - get_new_handler declaration changed
sql/sql_select.cc:
  - the actual fix for Bug#14210. In create_myisam_from_heap we should
  create the new table handler in TABLE::mem_root, not in THD::mem_root:
  the latter is freed shortly after cursor is open.
  - adjust create_tmp_table to explicitly supply &table->mem_root
  to get_new_handler when creating a handler for a new temporary table
sql/sql_table.cc:
  - get_new_handler declaration changed
sql/table.cc:
  - get_new_handler declaration changed
sql/unireg.cc:
  - get_new_handler declaration changed
tests/mysql_client_test.c:
  A test case for Bug#14210 "Simple query with > operator on large table
   gives server crash": a C API test case is worth adding because of different
  memory allocation/freeing patterns in handling of C API and SP cursors

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


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item.h:
  Auto merged

Invalid date like 2000-02-32 wasn't converted to int, which lead to not
using index and comparison with field as astring, which results in slow
query execution.

convert_constatn_item() and get_mm_leaf() now forces MODE_INVALID_DATES to
allow such conversion.


sql/item.h:
  Fix bug #14093 Query takes a lot of time when date format is not valid
  To Item_int_with_ref added method real_item() which returns ref.
sql/item_cmpfunc.cc:
   Fix bug #14093 Query takes a lot of time when date format is not valid
  convert_constant_item() now allows conversion of invalid dates like 2000-01-32 to int to make it possible to use index when comparing fields with such dates.
sql/opt_range.cc:
   Fix bug #14093 Query takes a lot of time when date format is not valid
  get_mm_leaf() modified so it allows index usage for comparing fields with invalid dates like 2000-01-32.
mysql-test/r/select.result:
  Test case for bug#14093 Query takes a lot of time when date format is not valid
mysql-test/t/select.test:
  Test case for bug#14093 Query takes a lot of time when date format is not valid

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


configure.in:
  Auto merged

 - Added some ifdefs and turn off auto template instantiation, use explicit template instantiation


configure.in:
  Use -Tno_implict to indicate that we specifiy which template should be instantiated.
  Turn on HAVE_EXPLICIT_TEMPLATE_INSTATNTIATION
extra/yassl/src/socket_wrapper.cpp:
  Include sys/filio.h if __SCO_VERSION__ is defined
extra/yassl/src/timer.cpp:
  Dont' include files from within namespace yaSSL.

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