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

  When detecting corrupt schema file.
  Make sure to close it (as it will be opened later when rewriting a clean copy)

Fix merge error

 forgott to add KeyDescriptor.hpp

  LQH computes incorrect hash values during NR (as it doesn't concider charsets)

  Solution: make LQH compute correct hash :-)
           1) move xfrm_key into SimulatedBlock so that there's _one_ impl.
           2) make TC, ACC, LQH use same impl.

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

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

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0

On 64 bit platforms the changed statement doesn't work
so making sure that the larger value is first and using
subtraction is a quick and backwards-compatible fix of this
line.

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0

into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug10950

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

into  mysql.com:/home/emurphy/src/work/mysql-5.0

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean

into  mysql.com:/home/emurphy/src/work/mysql-5.0

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

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

into  mysql.com:/home/cps/mysql/trees/mysql-5.0

Recommited with post-review fixes

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

NOT FOUND ...' in conditional handled incorrectly".

Whenever we remove an instruction during optimization, we need to
adjust instruction numbers (ip - instruction pointer) stored in all
instructions. In addition to that, sp_instr_hpush_jump, which 
corresponds to DECLARE CONTINUE HANDLER needs adjustment for m_handler,
which holds the number of instruction with the continue handler.
In the bug report, a wrong ip stored in m_handler was pointing at 
FETCH, which resulted in an error message and abnormal SP termination.
The fix is to just remove m_handler member from sp_instr_hpush_jump,
as it's always points to the instruction next to the DECLARE
statement itself (m_ip+1).

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

- Corrected problem with N-way nested natural joins in PS mode.
- Code cleanup
- More asserts to check consistency of name resolution contexts
- Fixed potential memory leak of name resolution contexts

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

remove grep stuff

  Add diagnostic code to track a crash in adaptive hash indexes; the crash may happen if block->index == NULL

  Added test cases for bug #12625.
sql_select.cc:
  Fixed bug #12625.
  Fixed invalid removal of constant items from the DISTINCT
  list in the function create_distinct_group.

into  eel.(none):/home/jonas/tmp/kkk/mysql-5.0

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0

  Temporarily remove error print if MySQL tries to do a SELECT even though trx->n_mysql_tables_in_use is 0. We must return the error print when the lock count of cursors is properly implemented (Bug #12456)

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

fix bk checkout properties

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