into  mysql.com:/usr/home/pem/mysql-5.0


sql/sql_yacc.yy:
  Auto merged

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

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

include/my_global.h:
  Avoid warnings on QNX, only define HAVE_RINT if not found by configure

Now many direct references to my_error() have been removed.


mysql-test/r/federated_archive.result:
  new results with new error message
mysql-test/t/federated_archive.test:
  corrected error number
sql/ha_federated.cc:
  some minor 80 column formatting
  corrected some error handling to be more handler print_error friendly
  moved duplicate code into new "stash_remote_error" function
sql/ha_federated.h:
  added error number, and places to stash error message and number
  added private method to stash error

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


mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged

into  ubuntu.(none):/home/reggie/bk/mysql-5.0

into  mishka.mysql.fi:/home/my/mysql-5.0


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

into  mishka.mysql.fi:/home/my/mysql-5.0


sql/unireg.cc:
  Auto merged

into  mishka.mysql.fi:/home/my/mysql-5.0


sql/item.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/t/mysqldump.test:
  Merge

Added flag to Field::store(longlong) to specify if value is unsigned.
This fixes bug #12750: Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
Fixed warning from valgrind in CREATE ... SELECT
Fixed double free of mysql.options if reconnect failed


mysql-test/mysql-test-run.sh:
  Added option --valgrind-mysqltest to allow one to run mysqltest with valgrind
mysql-test/r/bigint.result:
  Update results after fix for Field::store(longlong)
mysql-test/r/range.result:
  Update results after fix for Field::store(longlong)
mysql-test/r/strict.result:
  Update results after fix for Field::store(longlong)
  (This fixes some wrong results when storing things into bigint columns)
mysql-test/r/type_ranges.result:
  Update results after fix for Field::store(longlong)
mysql-test/t/bigint.test:
  Added testing for #12750: Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
mysql-test/t/innodb.test:
  Removed comments affected by this bug fix
mysql-test/t/mysqldump.test:
  Fixed result to not depend on existing config files
mysql-test/t/range.test:
  0xff numbers are now unsigned
mysql-test/t/strict.test:
  Added errors for things that previously (wrongly) succeeded
sql-common/client.c:
  Fixed double free of mysql.options if reconnect failed
sql/field.cc:
  Added flag to Field::store(longlong) to specify if value is unsigned
sql/field.h:
  Added flag to Field::store(longlong) to specify if value is unsigned
sql/field_conv.cc:
  Fixed calls to Field::store(longlong,flag)
sql/ha_ndbcluster.cc:
  Fixed calls to Field::store(longlong,flag)
sql/handler.cc:
  Fixed calls to Field::store(longlong,flag)
sql/item.cc:
  Fixed calls to Field::store(longlong,flag)
sql/item_sum.cc:
  Fixed calls to Field::store(longlong,flag)
sql/sp.cc:
  Fixed calls to Field::store(longlong,flag)
sql/sql_acl.cc:
  Fixed calls to Field::store(longlong,flag)
sql/sql_help.cc:
  Fixed calls to Field::store(longlong,flag)
sql/sql_show.cc:
  Fixed calls to Field::store(longlong,flag)
sql/sql_table.cc:
  Fixed varning from valgrind
sql/sql_udf.cc:
  Fixed calls to Field::store(longlong,flag)
sql/tztime.cc:
  Fixed calls to Field::store(longlong,flag)
sql/unireg.cc:
  Fixed calls to Field::store(longlong,flag)

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

server-tools/instance-manager/IMService.cpp:
  * setting username and password to NULL so that the 
  IM runs at LocalSystem (this should be changed soon)
  * implemented stop service by raising a sigterm
  * implemented start service by loading options and calling manager()
server-tools/instance-manager/IMService.h:
  changed the sig for Run()
server-tools/instance-manager/WindowsService.cpp:
  default debugging to false
  changed the sig of RuN()
server-tools/instance-manager/WindowsService.h:
  change the sig of run()
server-tools/instance-manager/instance.cc:
  * remove the inclusion of process.h
  * concat all args into a single buffer to pass to CreateProcess
server-tools/instance-manager/instance_options.cc:
  quoting the binary to handle paths with quotes
server-tools/instance-manager/listener.cc:
  use a timeval for select so that our select will only run
  for 100 msec before we check to see if we are shutting down
server-tools/instance-manager/mysqlmanager.cc:
  if we are given the stand alone option, then run the manager as 
  standalone
server-tools/instance-manager/options.cc:
  Added stand alone command line arg
server-tools/instance-manager/options.h:
  Added stand alone command line arg

into  linux.site:/home/reggie/bk/mysql-5.0-new

mysql-test/r/federated.result:
  fixed error message
sql/ha_federated.cc:
  Minor refactoring to fix error message, resulting in big whitespace change

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

sql/sql_base.cc:
  Auto merged
mysql-test/r/view.result:
  SCCS merged
mysql-test/t/view.test:
  SCCS merged

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


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

mysql-test/r/mysqldump.result:
  updated
mysql-test/t/mysqldump.test:
  cleanup, new test

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


sql/sql_yacc.yy:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.0-5000

into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin

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

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

into  mysql.com:/home/mydev/mysql-5.0-5000

into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


sql/sql_analyse.cc:
  Auto merged

  Second version after review. Allow 'set autocommit' in procedures, but not
  functions or triggers. Can return error in run-time (when a function calls
  a procedure).


mysql-test/r/sp-error.result:
  New test case for BUG#12712.
mysql-test/t/sp-error.test:
  New test case for BUG#12712.
sql/set_var.cc:
  Made sys_autocommit external, to allow testing in sql_yacc.yy.
sql/set_var.h:
  Made sys_autocommit external, to allow testing in sql_yacc.yy.
sql/share/errmsg.txt:
  New error message for disallowing the setting of autocommit in stored functions and triggers.
sql/sp_head.h:
  New flag: has 'set autocommit', and testing for this in is_not_allowed_in_function().
sql/sql_yacc.yy:
  Disallow setting AUTOCOMMIT in stored function and triggers.

- Avoid problem with  "Sun C++ 5.6 2004/07/15"


extra/yassl/taocrypt/src/integer.cpp:
  - Remove "inline" from the more advanced functions of class portable

into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin


mysql-test/t/sp.test:
  Auto merged
mysql-test/r/sp.result:
  SCCS merged

into  mysql.com:/home/mydev/mysql-5.0-5000

into  mysql.com:/usr/home/pem/mysql-5.0

                 get strange result
  according to Monty's suggestions, fixing the SELECT behaviour on errors
  with SP handlers. Note that some warnings from SELECT still shows up when
  the handler has caught - this is an effect of another known bug (BUG#7049).


mysql-test/r/sp.result:
  New test cases for BUG#12379.
mysql-test/t/sp.test:
  New test cases for BUG#12379.
sql/sql_class.cc:
  Abort selects on errors more graceful with SP handlers.
sql/sql_class.h:
  Abort selects on errors more graceful with SP handlers.

into  mysql.com:/home/cps/mysql/trees/mysql-5.0


mysql-test/r/sp.result:
  manual merge
mysql-test/t/sp.test:
  manual merge