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

  Adding esperanto collation


strings/ctype-uca.c:
  Adding esperanto collation
mysys/charset-def.c:
  Adding esperanto collation
mysql-test/t/ctype_uca.test:
  Adding esperanto collation
mysql-test/r/ctype_uca.result:
  Adding esperanto collation
config/ac-macros/character_sets.m4:
  Adding esperanto collation

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

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  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  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  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

sql/sql_parse.cc:
  Optimization, this reset is executed below anyway

  Fix typo.


server-tools/instance-manager/options.cc:
  Fix typo.

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

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

  Fix some comments.


extra/comp_err.c:
  Fix some comments.

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