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

We should not overwrite res if it is returned from a const item.

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

into bob.(none):/home/reggie/bk/mysql-4.1

sql_lex.cc:
  Set query to not cacheable if we are using multistatements and there are multiple statements in this query

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1

into mysql.com:/home/timka/mysql/src/4.1-bug-7331

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

into mysql.com:/home/timka/mysql/src/4.1-bug-7331

  after merge fix

  after merge fix

  bug#7839 ncorrect collation for char(ascii('a'))

  Move out-of-order option.

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

  bug#7891: mysql_character_set_name() returns collation

into mysql.com:/home/mysql_src/mysql-4.1-clean

  Bug#7721

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/mysql_src/mysql-4.1-clean

Fixed bug by adding code that displays the contents of mysql.host when \p is added as part of the prompt.

mysql.cc:
  Added code to display mysql.host as prompt when using shared memory

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

to 5.0 tree (since it was lost during last merge).