into  mysql.com:/home/pem/work/bug7049/mysql-5.0


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged

Make sure "select" aborts when finding a SP condition handler beyond the current scope.


mysql-test/r/sp.result:
  Updated test results after fixing error handling in select.
sql/mysqld.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/protocol.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.
sql/sp_rcontext.h:
  Added method for checking if the handler was found in the current context.
sql/sql_error.cc:
  Make sure "select" aborts when finding a SP condition handler beyond the current scope.

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0

  Disable tests of lock upgrade paths that are currently unsupported


ndb/test/ndbapi/testOperations.cpp:
  Disable lock upgrade paths that currently unsupported

Init KeyDescriptor before sending to DIH, 
  make sure that its always inited

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push

  testBackup, fix assertion


ndb/test/ndbapi/testBackup.cpp:
  Fetch table before verifying

  Test for bug#12812 moved from sp.test to sp-security.test


mysql-test/t/sp.test:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/t/sp-security.test:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/r/sp.result:
  Test for bug#12812 moved from sp.test to sp-security.test
mysql-test/r/sp-security.result:
  Test for bug#12812 moved from sp.test to sp-security.test

into deer.(none):/home/hf/work/mysql-5.0.12991


myisam/mi_check.c:
  Auto merged

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0


sql/ha_ndbcluster.cc:
  merge

Fix for Bug #13961  Triggers on tables with auto_increment insert bogus values into table (clean version)

  After merge fix.


client/mysql.cc:
  After merge fix.

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


client/mysql.cc:
  after merge fix.

into  mysql.com:/usr/home/bar/mysql-4.1


client/mysql.cc:
  Auto merged

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


strings/ctype-latin1.c:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-4.1


mysql-test/r/ctype_latin1.result:
  Auto merged
mysql-test/t/ctype_latin1.test:
  Auto merged

into  mysql.com:/usr/home/bar/mysql-5.0.char1

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

VC++Files/test1/mysql_thr.c:
  Fixed typo
VC++Files/thr_test/thr_test.c:
  Fixed typo
sql/log_event.cc:
  Removed compiler warning
  Fixed compile error on windows

into  mysql.com:/usr/home/bar/mysql-5.0.char1


strings/ctype-cp932.c:
  Auto merged

  after merge fix
  ,


mysql-test/r/ctype_utf8.result:
  after merge fix
  ,

into  mysql.com:/usr/home/bar/mysql-5.0.char1


mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item_func.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  after merge fix.
sql/sql_update.cc:
  discarding this change in 5.0.

into  mysql.com:/usr/home/bar/mysql-4.1.b13751

Netware. Hartmut informed about this.

into  mysql.com:/usr/home/bar/mysql-5.0.char1

netware/mysql_test_run.c:
  Fixed typo.
netware/pack_isam.def:
  Added screenname.
scripts/make_binary_distribution.sh:
  Fixed mistake in merge.

into  mysql.com:/usr/home/bar/mysql-4.1.b13751

into  mysql.com:/usr/home/bar/mysql-5.0.char1

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

into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  New version 5.0.16


configure.in:
  New version 5.0.16

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

  rc => GA


configure.in:
  rc => GA

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

Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
field::sort_key() now adds length last for varbinary/blob
VARBINARY/BLOB is now sorted by filesort so that shorter strings comes before longer ones
Fixed issues in test cases from last merge



mysql-test/r/select.result:
  Change column name in test to get GROUP BY to use the alias
mysql-test/r/type_blob.result:
  Test BLOB and VARCHAR sorting
mysql-test/t/select.test:
  Change column name in test to get GROUP BY to use the alias
  Drop used tables at start of test
  Don't use table names 'a', 'b' or 'c'
mysql-test/t/type_blob.test:
  Test BLOB and VARCHAR sorting
sql/field.cc:
  Store length last in VARBINARY() and BLOB() columns to get shorter strings sorted before longer onces
sql/field.h:
  Added method 'sort_length()' to allow one to have length bytes last for VARBINARY/BLOB to get these to sort properly
sql/filesort.cc:
  Use 'sort_length()' instead of 'pack_length()' to get length of field.
  Store suffix_length last for varbinary (blob) objects.
  The above ensures that BLOB/VARBINARY are correctly sorted (shorter strings before longer ones)
sql/sql_class.h:
  Added sort suffix length (to get varbinary/blob to sort correctly)
sql/sql_select.cc:
  Use sort_length() instead of pack_lengths()
strings/ctype-bin.c:
  Don't let strnxfrm_bin store length last
  Better to do it in MySQL field object to ensure it's done properly for all cases

into  sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1

- fixed test


mysql-test/r/rpl_multi_update2.result:
  fixed setting/reseting environment
  multi-update with subquery added
mysql-test/t/rpl_multi_update2.test:
  fixed setting/reseting environment
  multi-update with subquery added
sql/sql_update.cc:
  set 'updating' in both tables list if we have two of them (because of subquery)

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