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

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


sql/sql_analyse.cc:
  Auto merged

- 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:/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:/usr/home/ram/work/mysql-5.0

with /etc/my.cnf and ~/.my.cnf [client] section.

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

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

into  mysql.com:/home/timka/mysql/src/5.0-2486


sql/sql_parse.cc:
  Auto merged

  Have to init. all local variables in their frames, not just once at the beginning
  of invocation.


mysql-test/r/sp.result:
  New test case for BUG#13133.
mysql-test/t/sp.test:
  New test case for BUG#13133.
sql/sp_head.cc:
  Just init. local variable slots in the fram to NULL. (Real init. will be done
  in each block.)
sql/sp_pcontext.cc:
  Removed isset flag, since it's not used.
sql/sp_pcontext.h:
  Removed isset flag, since it's not used.
sql/sql_yacc.yy:
  Initialize local variables in the block to null, or the default value, given.
  (Untabifed block too.)

  VC6 can't handle initializing const in declaration


sql/sql_prepare.cc:
  VC6 can't handle initializing const in declaration

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

  Changed from C++ comments to C comments
  Did some adaption to MySQL Coding Style


extra/innochecksum.c:
  Changed from C++ comments to C comments
  Did some adaption to MySQL Coding Style

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


include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/violite.h:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
vio/viossl.c:
  Auto merged
configure.in:
  Resolve conflicts

into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged

  Corrected typo


mysql-test/mysql-test-run.pl:
  Corrected typo

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


mysql-test/mysql-test-run.pl:
  Auto merged

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


configure.in:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

into  mysql.com:/home/jimw/my/mysql-4.1-clean

mysql-test/r/ndb_autodiscover.result:
  Update results

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1

into  selena.:H:/MYSQL/src/#05588-mysql-4.1


include/my_global.h:
  Auto merged

into  kite-hub.kitebird.com:/tmp/merge-4.1

into  kite-hub.kitebird.com:/tmp/merge-4.1


README:
  Auto merged

  Update README (2nd try)


README:
  Update README (2nd try)

into  mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
include/my_pthread.h:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


mysql-test/r/temp_table.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
sql/sql_db.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/create.result:
  Merged from 4.1 to 5.0
mysql-test/r/innodb.result:
  Merged from 4.1 to 5.0
mysql-test/t/create.test:
  Merged from 4.1 to 5.0
sql/item_cmpfunc.cc:
  Merged from 4.1 to 5.0
sql/sql_table.cc:
  Merged from 4.1 to 5.0

mysql-test/r/select.result:
  post-merge fix
mysql-test/t/select.test:
  post-merge fix

into  mysql.com:/home/timka/mysql/src/5.0-bug-12943


sql/sql_parse.cc:
  Auto merged
mysql-test/r/select.result:
  merge BUG#12943
mysql-test/t/select.test:
  merge BUG#12943

into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008

into  mishka.mysql.com:/home/my/mysql-4.1

Fix for bug #13025; Server crash in filesort because wrong call to handler::position()


client/mysqltest.c:
  Code cleanup during review
mysql-test/r/innodb.result:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
mysql-test/t/innodb.test:
  Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
sql/filesort.cc:
  Don't call handler::position() if row was not found
sql/item_cmpfunc.cc:
  Indentation changes
sql/sql_select.cc:
  Moved variable to outer level