fix merge conflict

scripts we don't need commented out
s_dir script for creating directories bdb build process requires

into mysql.com:/home/walrus/bk/41

New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0

Fix for shutdown on Mac OS X

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

  Fix potential bus error in 64-bit computers in SHOW VARIABLES, if int is only 32-bit in them

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

into mysql.r18.ru:/usr/home/ram/mysql-4.1.bdb

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

select sql_calc_found_rows * from table limit 0;
It does ...

  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

  Backport of bug fix in 4.0: do not x-lock rows under LOCK TABLES READ unless the table is a temp table

into mysql.r18.ru:/usr/home/ram/mysql-4.1.bdb

  Fix crash when InnoDB temp table is truncated + fix bug: do not X-lock rows under LOCK TABLES except if the table is temp

into mysql.r18.ru:/usr/home/ram/mysql-4.1.monty1

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

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