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


mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
mysql-test/r/csv.result:
  Manual merge.
mysql-test/t/csv.test:
  Manual merge.

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25183


sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-25302

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


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

storage/heap/hp_write.c:
  Fix after manial merge: do cast _after_ pointer substruction.

into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug23443


sql/item_func.cc:
  Auto merged
storage/heap/hp_block.c:
  Auto merged
storage/heap/hp_write.c:
  Manual merge.

into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug23443


heap/hp_write.c:
  Auto merged
sql/item_func.cc:
  Auto merged

into  moonlight.home:/home/tomash/src/mysql_ab/mysql-4.1-bug23443


heap/hp_block.c:
  Auto merged
sql/item_func.cc:
  Auto merged
heap/hp_write.c:
  Manual merge.

           server

The problem was that when memory was exhausted HEAP engine could crash
(GROUP BY uses HEAP TABLE).  Alternatively, if SET was used, it could
report an error "You may only use constant expressions with SET" instead
of "Out of memory (Needed NNNNNN bytes)".

The solution is:
 - pass MY_WME to (some) calls to my_malloc() to get correct message.
 - fix heap_write() so that the first key is skipped during cleanup
   on ENOMEM because it wasn't inserted and doesn't have to be
   deleted.

No test case is provided because we can't test out-of-memory behaviour
in our current test framework.


heap/hp_block.c:
  If allocation fails, write an error message.
heap/hp_write.c:
  On ENOMEM, skip the first key in cleanup, as it wasn't inserted yet.
sql/item_func.cc:
  Add MY_WME so that OOM error will be reported.

mysql-test/t/warnings-master.opt:
  Added skip-innodb option (which was what it once was...)
mysql-test/t/warnings.test:
  Removed un-needed variable setting. Bug only had to do with unterimated string.

Cleaning up warning for windows. Innodb is compiled but disable on Windows, so it should be fine. NDB wasn't compiled in, which is what caused the issue. 


mysql-test/r/warnings.result:
  Modified warning to work with Windows
mysql-test/t/warnings.test:
  Moved warning to use Innodb.

into  zim.(none):/home/brian/mysql/merge-5.1

The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space). 


mysql-test/r/csv.result:
  Fixed test case for format change. Added new test for floating point numbers.
mysql-test/t/csv.test:
  Fixed test for format change. Added test case for floating point numbers.
storage/csv/ha_tina.cc:
  Updated code to handle numbers as raw unquotes types in CSV

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


storage/csv/CMakeLists.txt:
  Auto merged
storage/csv/Makefile.am:
  Auto merged

Split out the hidden class from the ha_tina file (probably should have just deleted it...) but this is a bit better. 


storage/csv/transparent_file.cc:
  BitKeeper file /home/brian/mysql/merge-5.1/storage/csv/transparent_file.cc
storage/csv/transparent_file.h:
  BitKeeper file /home/brian/mysql/merge-5.1/storage/csv/transparent_file.h
storage/csv/CMakeLists.txt:
  Updated for windows
storage/csv/Makefile.am:
  Updated to add new class
storage/csv/ha_tina.cc:
  Removed hidden class
storage/csv/ha_tina.h:
  Remove hidden class

This fix corrects build issues introduced by WL#3031:

- In the SQL grammar, 'USER' is a SQL 2003 reserved keyword,
and therefore should not be part of the keyword production.

- In sql/sql_parse.cc, the code for CREATE SERVER and ALTER SERVER
was not using proper format strings in the DBUG_PRINT statements.


sql/sql_parse.cc:
  Fixed compiler warnings
sql/sql_yacc.yy:
  Fixed reduce/reduce conflicts

Merge 5.1-main -> 5.1-runtime, added ignore entry for missing symbolic link


BitKeeper/etc/ignore:
  
  Fixed ignore entry

into  mysql.com:/d2/hf/common/my51-common


mysql-test/r/flush_block_commit_notembedded.result:
  merging

mysql-test/r/flush_block_commit_notembedded.result:
  result fixed

mysql-test/t/mysql_upgrade.test:
  test disabled in embedded server

mysql-test/t/ps_not_windows.test:
  disabled in embedded-server

into  mysql.com:/d2/hf/common/my51-common


libmysqld/lib_sql.cc:
  Auto merged

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


libmysqld/lib_sql.cc:
  merging

libmysqld/lib_sql.cc:
  reading warning count added

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-merge


mysql-test/r/sp.result:
  Auto merged
server-tools/instance-manager/commands.cc:
  Auto merged
server-tools/instance-manager/commands.h:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/guardian.h:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
server-tools/instance-manager/instance.h:
  Auto merged
server-tools/instance-manager/instance_map.cc:
  Auto merged
server-tools/instance-manager/instance_map.h:
  Auto merged
server-tools/instance-manager/instance_options.h:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
server-tools/instance-manager/manager.cc:
  Auto merged
server-tools/instance-manager/manager.h:
  Auto merged
server-tools/instance-manager/user_map.cc:
  Auto merged
sql/event_data_objects.cc:
  Auto merged
sql/event_queue.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

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

    Delete compiler-specific flag setting - it makes builds break.


server-tools/instance-manager/Makefile.am:
  Delete compiler-specific flag setting - it makes builds break.
  If this is really wanted, it must be done through "configure", caring about the compiler differences.

into  mysql.com:/d2/hf/common/my51-common

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

into  mysql.com:/d2/hf/common/my51-common


libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged

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


libmysqld/lib_sql.cc:
  merging

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


mysql-test/t/mysqladmin.test:
  Auto merged
sql/item_func.cc:
  Auto merged
libmysqld/lib_sql.cc:
  merging
mysql-test/t/distinct.test:
  merging
sql/sql_prepare.cc:
  SCCS merged

libmysqld/lib_sql.cc:
  error message moved to 'stmt'
mysql-test/t/distinct.test:
  temporary disabled in embedded server
mysql-test/t/mysqladmin.test:
  disabled in embedded server
sql/sql_prepare.cc:
  superfluous #ifndef removed

into  mysql.com:/home/kent/bk/main/mysql-5.1


mysql-test/r/view.result:
  Auto merged

  Temporary work around for bug#25359


mysql-test/r/view.result:
  Temporary work around for bug#25359

into  mysql.com:/d2/hf/common/my51-common


libmysqld/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_insert.cc:
  Auto merged
BitKeeper/deleted/.del-ps_not_windows.test:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged

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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into  mysql.com:/d2/hf/common/my41-common


sql/item_func.cc:
  Auto merged