BUG #11104 
      Took out the offset-=delimiter_length-1 out of the for loop. It was causing
      basically this: 
      select substring_index('the king of the the hill', 'the', -2) to not work.
      The first iteration, offset would be initialised to 24, then strstr would 
      point at 'the king of the the* hill' ('*'means right before the 
      character following), returning a offset of 16. The for loop would then 
      decrement offset by two (3 - 1), to 14, now pointing at 
      "the king of th*e the hill", _skipping_ past the 'e' in the second to last
      'the', and therefore strstr would never have a chance of matching the 
      second to last 'the', then moving on to the 'the' at the begginning of the 
      string!
      In a nutshell, offset was being decremented by too great a value, preventing
      the second to last 'the' from being ever found, hence the result of 
      'king of the the hill' from the query that is reported in the bug report
func_str.test:
  BUG #11104
  Added tests to make sure fix addresses issues in original bug report
func_str.result:
  BUG #11104 
  New results for new tests


mysql-test/r/func_str.result:
  BUG #11104 
  
  New results for new tests
mysql-test/t/func_str.test:
  BUG #11104
  
  Added tests to make sure fix addresses issues in original bug report
sql/item_strfunc.cc:
  BUG #11104 
      Took out the offset-=delimiter_length-1 out of the for loop. It was causing
      basically this: 
      select substring_index('the king of the the hill', 'the', -2) to not work.
      The first iteration, offset would be initialised to 24, then strstr would 
      point at 'the king of the the* hill' ('*'means right before the 
      character following), returning a offset of 16. The for loop would then 
      decrement offset by two (3 - 1), to 14, now pointing at 
      "the king of th*e the hill", _skipping_ past the 'e' in the second to last
      'the', and therefore strstr would never have a chance of matching the 
      second to last 'the', then moving on to the 'the' at the begginning of the 
      string!
  
      In a nutshell, offset was being decremented by too great a value, preventing
      the second to last 'the' from being ever found, hence the result of 
      'king of the the hill' from the query that is reported in the bug report

into  mysql.com:/usr/home/bar/mysql-4.1.b10892

into  mysql.com:/usr/home/bar/mysql-4.1.b10892

  After review fix


sql/item.cc:
  After review fix

into  mishka.local:/home/my/mysql-4.1

Changed assembler functions to not access global variables or variables in text segement
Added wrapper function in C to longlong2str() to pass _dig_vec_upper as an argument


mysql-test/r/bigint.result:
  More tests for parsing of bigint's
  More tests for different values to conv()
mysql-test/t/bigint.test:
  More tests for parsing of bigint's
  More tests for different values to conv()
strings/Makefile.am:
  Added longlong2str_asm.c
strings/longlong2str-x86.s:
  Changed functions to not access variables in text segment
  Fixed this by adding global variable '_dig_vec_upper' as an argument to longlong2str_with_dig_vector()
strings/my_strtoll10-x86.s:
  Removd array lfactor by calculating the value in code
  (this is to to make the code position independent)
strings/longlong2str_asm.c:
  New BitKeeper file ``strings/longlong2str_asm.c''

into rurik.mysql.com:/home/igor/mysql-4.1

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

  Added test case for bug #11867.
  Fixed results for two existing test cases.
subselect.test:
  Added test case for bug #11867.
item_subselect.cc:
  Fixed bug #11867.
  Added missing code in Item_in_subselect::row_value_transformer
  that caused problems for queries with
  ROW(elems) IN (SELECT DISTINCT cols FROM ...).


sql/item_subselect.cc:
  Fixed bug #11867.
  Added missing code in Item_in_subselect::row_value_transformer
  that caused problems for queries with
  ROW(elems) IN (SELECT DISTINCT cols FROM ...).
mysql-test/t/subselect.test:
  Added test case for bug #11867.
mysql-test/r/subselect.result:
  Added test case for bug #11867.
  Fixed results for two existing test cases.

In init_prepare_fake_select_lex() don't empty ftfunc_list. UNION's ORDER BY clause may 
contain MATCH(...), for which fix_index() should be called.


mysql-test/r/fulltext_order_by.result:
  BUG#11869 part2 : added another test case
mysql-test/t/fulltext_order_by.test:
  BUG#11869 part2 : added another test case

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

into mysql.com:/home/psergey/mysql-4.1-bug11869-part2

When creating temporary table for UNION, pass TMP_TABLE_FORCE_MYISAM flag to 
create_tmp_table if we will be using fulltext function(s) when reading from the 
temp. table.


mysql-test/r/fulltext_order_by.result:
  Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error)
mysql-test/t/fulltext_order_by.test:
  Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error)
sql/mysql_priv.h:
  BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
  Added TMP_TABLE_FORCE_MYISAM flag
sql/sql_select.cc:
  BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
  In create_tmp_table(), honor the TMP_TABLE_FORCE_MYISAM flag

Added a check before taking a global read lock if
the own thread has a write locked table.


mysql-test/r/flush.result:
  Bug#9459 - deadlock with flush with lock, and lock table write
  The test result.
mysql-test/t/flush.test:
  Bug#9459 - deadlock with flush with lock, and lock table write
  The test case.

into moonbone.local:/work/mysql-4.1-bug-12266

mysql-test/r/query_cache.result:
  Updated results
mysql-test/t/query_cache.test:
  Change test to use a truly invalid date, now that dates like 
  '20050327 0:0:0' are handled as they are in 4.0.

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

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

length.

When temporary field created for DATE(LEFT(column,8)) expression, max_length
value is taken from Item_date_typecast, and it is getting it from underlaid
Item_func_left and it's max_length is 8 in given expression. And all this
results in stripping last 2 digits.

To Item_date_typecast class added its own fix_length_and_dec() function 
that sets max_length value to 10, which is proper for DATE field.


mysql-test/t/group_by.test:
  Test case for bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced length.
mysql-test/r/group_by.result:
  Test case for bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced length.
sql/item_timefunc.h:
  Fix bug#12266 GROUP BY DATE(LEFT(column,8)) returns result strings with reduced length.
  To Item_date_typecast class added its own fix_length_and_dec() which sets proper max_length value.

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

  Back ported ndbcluster_support() from 5.0
  Corrected the server id handling


mysql-test/mysql-test-run.pl:
  Back ported ndbcluster_support() from 5.0
  Corrected the server id handling

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

  Added the blackhole storage engine to the Max builds


VC++Files/sql/mysqld.dsp:
  Added the blackhole storage engine to the Max builds

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

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


mysql-test/t/myisam.test:
  Auto merged

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


sql/ha_innodb.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

  the rpm spec file changelog


sql/ha_innodb.cc:
  - Merge: used local version (as the fix in 4.0 was a backport)
support-files/mysql.spec.sh:
  - manual merge from 4.0

  fixing tests accordingly
item.cc:
  Bug #10892 user variables not auto cast for comparisons
  When mixing strings with different character sets,
  and coercibility is the same, we allow conversion
  if one character set is superset for other character set.


sql/item.cc:
  Bug #10892 user variables not auto cast for comparisons
  When mixing strings with different character sets,
  and coercibility is the same, we allow conversion
  if one character set is superset for other character set.
mysql-test/t/grant.test:
  fixing tests accordingly
mysql-test/r/grant.result:
  fixing tests accordingly

4.1 version of the patch


libmysql/libmysql.c:
  here we close errorlog file
sql/mysql_priv.h:
  stderror_file declared
sql/mysqld.cc:
  stderror_file saved

  the MySQL-server RPM spec file (BUG#12348)


support-files/mysql.spec.sh:
  - Fixed the creation of the mysql user group account in the postinstall section
   (BUG#12348)

support-files/mysql.spec.sh:
  - fixed enabling the Archive storage engine for the mysqld-max binary

that platform, not real failures. (Bug #12328, Bug #11569)


mysql-test/t/packet.test:
  Skip this test on Windows
mysql-test/t/rpl_flush_tables.test:
  Skip this test on Windows
mysql-test/include/not_windows.inc:
  Add include for skipping tests on Windows

Adds --replace_column to make test results deterministic.


mysql-test/r/rpl_slave_status.result:
  BUG#12330 updated result file which I missed in last changeset
  This updates the test to use --replace_column to make the test
  deterministic.

into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug12330

mysql-test/t/rpl_slave_status.test:
  Add --replace-column to make show slave status deterministic

into mysql.com:/M41/mysql-4.1

BitKeeper/etc/config:
  Auto merged
VC++Files/client/mysql.dsp:
  Auto merged
VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqlcheck.dsp:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/client/mysqltest.dsp:
  Auto merged
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqlmanager/mysqlmanager.dsp:
  Auto merged
acinclude.m4:
  Auto merged
zlib/ChangeLog:
  Auto merged
zlib/FAQ:
  Auto merged
zlib/INDEX:
  Auto merged
zlib/README:
  Auto merged
zlib/crc32.c:
  Auto merged
zlib/deflate.c:
  Auto merged
zlib/deflate.h:
  Auto merged
zlib/gzio.c:
  Auto merged
zlib/infback.c:
  Auto merged
zlib/inffast.c:
  Auto merged
zlib/inflate.c:
  Auto merged
zlib/inftrees.c:
  Auto merged
zlib/inftrees.h:
  Auto merged
zlib/trees.c:
  Auto merged
zlib/zconf.h:
  Auto merged
zlib/zlib.3:
  Auto merged
zlib/zlib.h:
  Auto merged
zlib/zutil.h:
  Auto merged

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