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

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

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

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

into  eel.(none):/home/jonas/src/mysql-4.1-push

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0


mysql-test/t/rpl_slave_status.test:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged

  produce warning for 'create database if not exists' if database exists
  do not update database options in this case  
  produce warning for 'create table if not exists' if table exists



mysql-test/r/create.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/temp_table.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/r/warnings.result:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    updated test case result
mysql-test/t/create.test:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    test case
sql/sql_db.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create database if not exists' if database exists
    do not update database options in this case
sql/sql_table.cc:
  Fix for bug #6008: MySQL does not create warnings when creating database and using IF NOT EXISTS
    produce warning for 'create table if not exists' if table exists

corrected typo in ndb Parser

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

into  mysql.com:/usr/home/ram/work/5.0.b12917

into  mysql.com:/usr/home/ram/work/5.0.b12917

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

into mysql.com:/home/gluh/MySQL/Merge/5.0

into  mysql.com:/usr/home/ram/work/5.0.b12917

into  eel.(none):/home/jonas/src/mysql-4.1-push

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


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

to eliminate nondeterminism in slave start

into  mysql.com:/usr/home/ram/work/5.0.b12917

into  eel.(none):/home/jonas/src/mysql-5.0-push

into  eel.(none):/home/jonas/src/mysql-4.1-push

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

into  mysql.com:/usr/home/ram/work/5.0.b12917

into  hundin.mysql.fi:/home/jan/mysql-5.0

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

Repair of condition pushdown after Item_func_between/in objects now directly represent NOT BETWEEN/IN expressions (ChangeSet@1.2402.1.1)

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

mysql-test/r/select.result:
  Test for BUG#13067
mysql-test/t/select.test:
  Test for BUG#13067
sql/sql_base.cc:
  Correctly compare field names with respect to case sensitivity.

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

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


mysql-test/t/analyse.test:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
mysql-test/r/analyse.result:
  Merge from 4.1

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

into  eel.(none):/home/jonas/src/mysql-5.0-push

into  eel.(none):/home/jonas/src/mysql-4.1-push

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0

into  mysql.com:/users/lthalmann/bk/mysql-5.0


mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
sql/sql_parse.cc:
  Manual marge