mysql-test/r/cast.result:
  Move the warning to corecct place

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


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
mysys/my_init.c:
  Auto merged
sql/sql_update.cc:
  Auto merged
Makefile.am:
  Manual merge
mysql-test/r/cast.result:
  Manual merge
mysql-test/t/cast.test:
  Manual merge
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Manual merge
sql/ha_ndbcluster.cc:
  Manual merge
sql/item.h:
  Manual merge
sql/opt_sum.cc:
  Manual merge
sql/sql_delete.cc:
  Manual merge
sql/sql_lex.cc:
  Manual merge
sql/sql_load.cc:
  Manual merge
sql/sql_prepare.cc:
  Manual merge

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

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

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

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

client/mysqldump.c:
  BUG #7815
  
  Pre-push fixes requested per Sergei's review.

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

into rurik.mysql.com:/home/igor/dev/mysql-5.0-2

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

 -  Improve detection of when to disable inlining for integer.cpp


config/ac-macros/yassl.m4:
  Use variable $host_cpu the check for sparc.
  Print a message when inlining is disabled

mysql-test/mysql-test-run.pl:
  .err files of the mysqld servers should be appended to, not reset every time we restart
  the mysqlds during the testsuite.

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


client/mysqltest.c:
  Manual merge
mysql-test/mysql-test-run.pl:
  patch alredy commited

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

 - It seems like malloc(0) returns a null pointer on aix52


extra/yassl/mySTL/vector.hpp:
  Don't allow malloc(0), if n is 0 use 1

into  127.(none):/home/osku/mysql/5.0/clean

into polly.local:/home/kaa/src/mysql-5.0

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

into  127.(none):/home/osku/mysql/5.0/clean

innobase/include/trx0trx.h:
  Change trx_set_detailed_error's second argument to const char*.
innobase/trx/trx0trx.c:
  Change trx_set_detailed_error's second argument to const char*.

  Fixed bug #13410.
  Fixed name resolution for qualified reference to a view column
  in the HAVING clause.
view.result, view.test:
  Added a test case for bug #13410.


mysql-test/t/view.test:
  Added a test case for bug #13410.
mysql-test/r/view.result:
  Added a test case for bug #13410.
sql/item.cc:
  Fixed bug #13410.
  Fixed name resolution for qualified reference to a view column
  in the HAVING clause.

  Define SHUT_RDWR for OpenServer 5


server-tools/instance-manager/portability.h:
  Define SHUT_RDWR for OpenServer 5

Changes per serg to http://lists.mysql.com/internals/30281

Re-enabled --delayed-insert


client/mysqldump.c:
  BUG #7815 
  
  Changes per serg on patch: http://lists.mysql.com/internals/30281
  
  1. Re-enabled --delayed-insert
       - modified options, removed code that was in place until bug was 
         fixed    
  2. Moved the call to get_table_structure to dump_table 
    - Use added 'ignore_flag' variable to determine what exactly is
      being ignored - whole table or just delayed insert ability
  3. Changed return type of ignore_table to char with byte value that
     determines what exactly is being ignored - the whole table, or
     delayed inserts
  4. Added ignore_table flags IGNORE_DATA and IGNORE_INSERT_DELAYED
  5. Added logic in get_table_structure to not append INSERT data text
     if the table's data isn't going to be dumped because the return
     value from ignore_table is IGNORE_DATA
  6. Changed the name of numFields to numfields. Studly caps aren't
     consistent with the rest of the code!
  7. Added inclusive list to check_if_ignore_table to set the flag to
     IGNORE_INSERT_DELAYED if the table type doesn't support delayed
     inserts.
  8. More documentation
mysql-test/r/mysqldump.result:
  BUG #7815 new results
mysql-test/r/mysqldump-max.result:
  BUG #7815
  
  New test results
mysql-test/t/mysqldump-max.test:
  BUG #7815
  New test for testing if insert delayed is applied to tables that support
  it in mysqldump, but only if all storage engines in test have been compiled
  in

into rurik.mysql.com:/home/igor/dev/mysql-5.0-2

  Fixed bug #13411.
  Fixed name resolution for non-qualified reference to a view column
  in the HAVING clause.
view.result, view.test:
  Added a test case for bug #13411.


mysql-test/t/view.test:
  Added a test case for bug #13411.
mysql-test/r/view.result:
  Added a test case for bug #13411.
sql/item.cc:
  Fixed bug #13411.
  Fixed name resolution for non-qualified reference to a view column
  in the HAVING clause.
sql/sql_base.cc:
  Fixed bug #13411.
  Fixed name resolution for non-qualified reference to a view column
  in the HAVING clause.

Fixed SETUP.sh to not overwrite prefix_configs, making 'make install' 
install in "/"


BUILD/SETUP.sh:
  BUG #13511
  
  test -n is for testing if a FILE is zero length! Plus, if the value is zero,
  we don't want to set it to that value, we want to leave it as it was 
  already set. We _want_ to set it _if_ it is _not_ zero. Changed to "! -z",
  which is for testing strings.

    Replaced the dumb in-handler/not-in-handler check with a proper recursion
    check of handlers being executed.
    (Re-commit in a different tree, to make push possible.)


mysql-test/r/sp.result:
  New test case for BUG#6127.
mysql-test/t/sp.test:
  New test case for BUG#6127.
sql/sp_head.cc:
  Replaced the setting of ctx->in_handler with a enter/exit handler methods.
sql/sp_rcontext.cc:
  Replaced the boolean in_handler flag with a stack of handlers being exectuted, for proper recursion check.
sql/sp_rcontext.h:
  Replaced the boolean in_handler flag with a stack of handlers being exectuted, for proper recursion check.
  (And added some comments in the sp_rcontext class.)

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

For LOCK view is opened but not prepared thus leaving 'table' field set to
NULL. invalidate_locked_for_write() wasn't checking that and call to 
invalidate_table(NULL) crashes server.

To invalidate_locked_for_write() added check that ensures that table is
completely opened.


sql/sql_cache.cc:
  Fix bug #13424 locking view with query cache enabled crashes server
  Added check that table is completely opened.
mysql-test/t/view_query_cache.test:
  Test case for bug#13424 locking view with query cache enabled crashes server
mysql-test/r/view_query_cache.result:
  Test case for bug#13424 locking view with query cache enabled crashes server

into  mysql.com:/users/lthalmann/bk/mysql-4.1-max

into  mysql.com:/home/mydev/mysql-4.1-4100

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

into  127.(none):/home/osku/mysql/5.0/clean

extra/yassl/taocrypt/include/hmac.hpp:
  Rename BSIZE to HMAC_BSIZE to avoid conflict with BSIZE on "openserv 3.2 5.0.7"

innobase/row/row0ins.c:
  Don't assert on temp file creation failure.