into sinisa.nasamreza.org:/mnt/work/mysql-4.1

bad merge fixed

bug#1269

into sinisa.nasamreza.org:/mnt/work/mysql-4.1

Parse error caused global ORDER BY to be initialized although it should
not have been.

Optimize calls to current_thd

Remove sel000xxxx tests
After merge fixes

Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)

embedded&client library
some fixes: zero at the end of the data added
mysql_list_fields became 'virtual'

into mashka.mysql.fi:/home/my/mysql-4.0

   use the local machine's IP address instead of the host name when 
   building the initial grant tables if "skip-name-resolve" has been
   specified in my.cnf. This can be helpful on FreeBSD to avoid
   thread-safety problems with the FreeBSD resolver libraries.
   (Thanks to Jeremy Zawodny for the patch)

 - tagged ChangeSet 1.1556 as mysql-4.0.15

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

This is to simplify fixing indexes to mean number of chars rather than bytes too.

into deer.(none):/home/hf/work/mysql-4.1.2way

Minor fixes

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

into deer.(none):/home/hf/work/mysql-4.1.2way

mysql_fetch_length fixed for embedded library. Now data length is stored
before the data. Pointers in row still points to the data so you have to
get *(uint*)(data_ptr - sizeof(uint)) to get data length

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

into mysql.r18.ru:/usr/home/ram/work/4.1

Fix bug in SHOW GRANTS when there is a column privilege but no table privilege

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

Happens when braces are used on a single select, which leads
to the uninitialized global parameters structure.

fixed IN optimisation bug

into deer.(none):/home/hf/work/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0

into eagle.mysql.r18.ru:/home/vva/work/BUG_1184/mysql-4.0