Detect conflicting options in SELECT


mysql-test/r/select.result:
  Test for bug#8733
mysql-test/t/select.test:
  Test for bug#8733
sql/mysql_priv.h:
  New bit for ALL
sql/sql_yacc.yy:
  We want to complain if DISTINCT or ALL is used in SELECT when a
  conflicting option is already selected.

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


mysys/default.c:
  Auto merged

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


configure.in:
  Auto merged

into mysql.com:/home/psergey/mysql-4.1-bug9228

into mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged

relative sizes of int/long/longlong.
 

into moonbone.local:/usr/src/mysql-4.1

Reset old error if tmp table was successfully created.

Test data is large and can be found in bug report along with test query.


sql/sql_select.cc:
  Fix bug #9703
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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

mysql-test/r/query_cache.result:
  Resolve merge
mysql-test/t/query_cache.test:
  Resolve merge

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


configure.in:
  Auto merged

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


configure.in:
  Auto merged

Produce warnings of wrong cast of strings to signed/unsigned.
Don't block not resolved IP's if DNS server is down (Bug #8467)
Fix compiler problems with MinGW (Bug #8872)


configure.in:
  Fix compiler problems with MinGW (Bug #8872)
include/config-win.h:
  Fix compiler problems with MinGW (Bug #8872)
include/my_global.h:
  Fix compiler problems with MinGW (Bug #8872)
mysql-test/r/cast.result:
  Test for cast to signed/unsigned outside of range (Bug #7036)
mysql-test/t/cast.test:
  Test for cast to signed/unsigned outside of range (Bug #7036)
mysys/default.c:
  Cleanup (combine identical code). 
  Done mainly by Jani
sql/field.h:
  Added cast_to_int_type() to ensure that enums are casted as numbers
sql/hostname.cc:
  Don't block not resolved IP's if DNS server is down (Bug #8467)
sql/item.h:
  Added cast_to_int_type() to ensure that enums are casted as numbers
sql/item_func.cc:
  CAST(string_argument AS UNSIGNED) didn't work for big integers above the
  signed range. (Bug #7036)
  Produce warnings of wrong cast of strings to signed/unsigned
sql/item_func.h:
  CAST(string_argument AS UNSIGNED) didn't work for big integers above the
  signed range. (Bug #7036)

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into mysql.com:/home/mydev/mysql-4.1-4100

into mysql.com:/home/mydev/mysql-4.1-4100

Changed the creation of the .MRG file so that only the table  name
is written when the MyISAM table is in the same database as the
MERGE table, a relative path is used in other cases in mysqld,
and possibly an absolute path is used in an embedded server.
No test case is added as the external behaviour is unchanged.
Only the file names within the .MRG file are changed.


include/my_sys.h:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Added declaration for a new function.
myisammrg/myrg_open.c:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Changed check for absolute path to check for any path.
mysys/my_getwd.c:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Added a new functions which checks for absolute _or_
  relative paths.
sql/ha_myisammrg.cc:
  BUG#5964 - 4.1 MERGE tables regression from 4.0
  Changed the creation of the .MRG file so that only the table  name
  is written when the MyISAM table is in the same database as the
  MERGE table, a relative path is used in other cases in mysqld,
  and possibly an absolute path is used in an embedded server.

into mysql.com:/home/psergey/mysql-4.1-bug9298

Merge from 4.0.

This is the second of three changesets. It contains the pure bug fix.
It also contains the second after-review fixes.
The problem was that with gcc on x86, shifts are done modulo word size. 
'value' is 32 bits wide and shifting it by 32 bits is a no-op.
This was triggered by an evil distribution of character incidences. 
A distribution of 2917027827 characters made of 202 distinct values led to
34 occurrences of 32-bit Huffman codes.
This might have been the first time ever that write_bits() had to write
32-bit values. Since it can be expected that one day even 32 bits might
be insufficient, the third changeset suggests to enlarge some variables
to 64 bits.

into mysql.com:/home/my/mysql-4.1

BUILD/check-cpu:
  Remove the exit 0 from check-cpu

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

 - Remove ha_archive::rename_table and move the fix to handler::rename_table


sql/examples/ha_archive.cc:
  Remove ha_archive::rename_table
sql/examples/ha_archive.h:
  Remove ha_archive::rename_table
sql/handler.cc:
  Fix handler::rename_table so it does not care about if the file to rename is missing

Fix for avoiding gettin Invalid schema object version when doing local changes, more post review fixes

mysql-test/mysql-test-run.sh:
  Set up arguments for mysql_client_test when testing
  the embedded server.
tests/mysql_client_test.c:
  Add -A switch for passing arguments to the embedded server.

configure.in:
  Use more flexible for test for CXX being gcc.

into mysql.com:/home/my/mysql-4.1


sql/sql_insert.cc:
  Auto merged

into neptunus.(none):/home/msvensson/mysql/mysql-4.1


configure.in:
  Auto merged

into mysql.com:/home/psergey/mysql-4.1-bug9298

After merge fix.

into mysql.com:/home/psergey/mysql-4.1-bug9298

into mysql.com:/home/psergey/mysql-4.1-bug9298

sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged