lower_case_tables_names=2 is sensible. Related to Bug #7887.


sql/mysqld.cc:
  Set lower_case_file_system when it is being tested to check
  if lower_case_tables_names=2 is sensible.

on a case-sensitive filesystem. (Bug #7887)


sql/mysqld.cc:
  Add warning when running with lower_case_table_names=2 and datadir is
  on a case-sensitive filesystem.

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

(Simpler fix than last commit -- no need to mess with base_cxxflags.)


BUILD/compile-amd64-max:
  use $max_cflags
BUILD/compile-pentium-debug-max:
  use $max_cflags
BUILD/compile-pentium-debug-max-no-embedded:
  use $max_cflags
BUILD/compile-pentium-max:
  use $max_cflags
BUILD/compile-pentium-valgrind-max:
  use $max_cflags
BUILD/compile-ppc-debug-max:
  use $max_cflags
BUILD/compile-ppc-max:
  use $max_cflags
BUILD/compile-amd64-debug-max:
  use $max_cflags, remove unnecessary base_cxxflags stuff

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

  when using shm transporter, set sigmask on each thread using pthread_sigmask


configure.in:
  Add more functions needed for SHM
ndb/src/common/portlib/NdbThread.c:
  1) Create thread wrapper function
  2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
ndb/src/common/transporter/TransporterRegistry.cpp:
  (un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
sql/ha_ndbcluster.cc:
  cast pointer to UintPtr before printout

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

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

mysql-test/r/union.result:
  result for a test case for the wrong examined rows with UNION's
mysql-test/t/union.test:
  test case for the wrong examined rows with UNION's
sql/sql_union.cc:
  a patch for the wrong examined rows with UNION's

mysql-test/r/type_float.result:
  Update test results (4.1 produces a warning that 4.0 did not,
  and they were merged into the wrong position).

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

sql/field_conv.cc:
  Auto merged
mysql-test/r/type_float.result:
  Merge
mysql-test/t/type_float.test:
  Merge

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

into mysql.com:/home/dlenev/src/mysql-4.1-merges

prefix", which roots were fixed in 4.0 tree.


mysql-test/r/alter_table.result:
  Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
  prefix".
mysql-test/t/alter_table.test:
  Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
  prefix".

client/Makefile.am:
  Remove  explicit _DEPENDENCIES, they are not needed with automatic
   dependency tracking wich we started using several months ago.
  Don't use relative paths in makefiles.
regex/Makefile.am:
  Remove  explicit _DEPENDENCIES, they are not needed with automatic
   dependency tracking wich we started using several months ago.
  Don't use relative paths.
strings/Makefile.am:
  Remove dead rule.

TIMESTAMP prefix" into 4.1 tree.


sql/field.h:
  Manual merge.

into mysql.com:/home/dlenev/src/mysql-4.0-bg7884

macros.

It does not fixes any bugs in 4.0. But it prevents from future error in
any bugfixes that may use these macros. Also after merging into 4.1 tree
this cleanup will fix bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix".


sql/field.h:
  Since FIELDFLAG_INTERVAL, FIELDFLAG_BITFIELD, FIELDFLAG_BLOB and
  FIELDFLAG_GEOM flags occupy the same space as number of decimals for
  FIELDFLAG_NUMBER fields, it is safer to check in "f_is_geom()"-type
  macros that we have non-number field, like we already do in f_is_blob()
  macro.

not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.


mysql-test/r/analyse.result:
  SELECT PROCEDURE ANALIZE now returns
  BINARY columns, which is much better than it worked
  previously: CHAR with the default character set.
  But in the future it's worth to fix the fields
  'Field_name' and 'Optimal_fieldtype' to use UTF8,
  and 'Min_value' and 'Max_value' to inherit their charsets
  from the original items. But it is not important,
  and BINARY(N) is OK for now.
mysql-test/r/case.result:
  Test fix according to the changes
mysql-test/r/metadata.result:
  Test fix according to the changes
mysql-test/r/ps_1general.result:
  Test fix according to the changes
mysql-test/r/ps_2myisam.result:
  Test fix according to the changes
mysql-test/r/ps_3innodb.result:
  Test fix according to the changes
mysql-test/r/ps_4heap.result:
  Test fix according to the changes
mysql-test/r/ps_5merge.result:
  Test fix according to the changes
mysql-test/r/ps_6bdb.result:
  Test fix according to the changes
mysql-test/r/ps_7ndb.result:
  Test fix according to the changes
mysql-test/r/union.result:
  Test fix according to the changes
sql/item.cc:
  Item is now BINARY by default
sql/item_cmpfunc.cc:
  IFNULL now collects arguments collations/charsets
  like other functions do.

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

into mysql.com:/space/my/mysql-4.0

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

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

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

sql/filesort.cc:
  Auto merged

mysys/my_symlink.c:
  More debugging

set to a negative value. (Bug #7700)


sql/field_conv.cc:
  Don't treat real fields as identical when destination is unsigned and
  the source is not.
mysql-test/t/type_float.test:
  Add test for setting double unsigned to a negative value from a signed double
mysql-test/r/type_float.result:
  Add test results

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

Working around hang of master < 3.23.50 on SELECT @@unknown_var
(to enable 3.23.49->4.1.10 replication)


sql/slave.cc:
  Working around hang of master < 3.23.50 on SELECT @@unknown_var
  (to enable 3.23.49->4.1.10 replication)

and the default character set is multi-byte, which will result in character
column size changes. (Bug #6913)


sql/table.cc:
  Print a warning when an old table is opened and the
  default character set is multi-byte that warns about
  character column sizes possibly getting changed

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


BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged

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


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

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

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

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

into mysql.com:/space/my/mysql-4.1-build


Build-tools/Do-pkg:
  Auto merged