into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11538


acinclude.m4:
  Auto merged

  Added missing drop statement
subselect.test:
  Added missing drop statement.


mysql-test/t/subselect.test:
  Added missing dro statement.
mysql-test/r/subselect.result:
  Added missing drop statement

  Fixed bug #11479.
  The JOIN::reinit method cannot call setup_tables
  after the optimization phase since this function
  removes some optimization settings for joined
  tables. E.g. it resets values of the null_row flag to 0.
subselect.result, subselect.test:
  Added a test case for bug #11479.


mysql-test/t/subselect.test:
  Added a test case for bug #11479.
mysql-test/r/subselect.result:
  Added a test case for bug #11479.
sql/sql_select.cc:
  Fixed bug #11479.
  The JOIN::reinit method cannot call setup_tables
  after the optimization phase since this function
  removes some optimization settings for joined
  tables. E.g. it resets values of the null_row flag to 0.

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

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

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


sql/mysqld.cc:
  Auto merged

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

into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1

into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1

mysql-test/r/subselect.result:
  testst of IN subqueries with row
mysql-test/t/subselect.test:
  tests of ion subqueries with row
sql/item.h:
  add method to prevent of removing Item_ref_null_helper from HAVING
sql/item_cmpfunc.h:
  Prevented removing of Item_test_isnotnull from HAVING
sql/item_subselect.cc:
  fixed converting row IN subqueries
sql/sql_select.cc:
  fixed debug print

  Don't skip SET command even if --replicate-wild* says to.
  E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)


sql/sql_parse.cc:
  Don't skip SET command even if --replicate-wild* says to.
  E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)

-T option is used. (Bug #12235)


myisam/myisampack.c:
  Clean up temporary files when -T was used.

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

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


sql/item_strfunc.cc:
  Auto merged

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


support-files/MacOSX/Makefile.am:
  Auto merged
support-files/Makefile.am:
  Auto merged
support-files/MacOSX/postflight.sh:
  Auto merged

into  radha.local:/Users/patg/mysql-build/mysql-4.1.clean

  preflight/postflight instead, so they are run every time a PKG is installed, not only for
  a fresh installation


support-files/MacOSX/Makefile.am:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
support-files/MacOSX/postflight.sh:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
support-files/MacOSX/preflight.sh:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
  - fixed comment typo

  change was too drastic) (BUG#12506)


support-files/Makefile.am:
  - make sure that the RPM spec files are built, but not installed by "make install"

  postmerge fix


mysql-test/r/query_cache_notembedded.result:
  postmerge fix
mysql-test/t/query_cache_notembedded.test:
  postmerge fix

BitKeeper/deleted/.del-query_cache_notembedded.result:
  Delete: mysql-test/r/query_cache_notembedded.result
BitKeeper/deleted/.del-query_cache_notembedded.test:
  Delete: mysql-test/t/query_cache_notembedded.test
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged

mysql-test/t/query_cache_notembedded.test:
  Rename: mysql-test/t/query_cache_noembeded.test -> mysql-test/t/query_cache_notembedded.test
mysql-test/r/query_cache_notembedded.result:
  Rename: mysql-test/r/query_cache_noembeded.result -> mysql-test/r/query_cache_notembedded.result

query that mixed statements that do and do not return info. (Bug #11688)


mysql-test/r/metadata.result:
  Add new results
mysql-test/t/metadata.test:
  Add new regression test
sql-common/client.c:
  Clear mysql->info in free_old_query()

in invoking mysqlcheck.


client/mysqlcheck.c:
  BUG #12253. Removed logic that would skip adding the corrupt table name 
  if "--fast" was included along with "--auto-repair". Added some comments 
  as well.

sql/sql_cache.cc:
  block QC using if tables are locked with LOCK
  unlock QC
mysql-test/r/query_cache_noembeded.result:
  New BitKeeper file ``mysql-test/r/query_cache_noembeded.result''
mysql-test/t/query_cache_noembeded.test:
  New BitKeeper file ``mysql-test/t/query_cache_noembeded.test''

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


sql/ha_ndbcluster.cc:
  Auto merged

include/my_list.h:
  Rename rest() macro to list_rest().
mysys/list.c:
  rest() renamed to list_rest().
mysys/thr_lock.c:
  rest() renamed to list_rest().
sql/sql_test.cc:
  rest() renamed to list_rest().

into  xiphis.org:/usr/home/antony/work2/p2-bug10109.3


sql/sql_parse.cc:
  Auto merged

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

after normal connection threads. (Bug #11796)


sql/mysqld.cc:
  Move call to end_slave() after first loop through killing threads,
  to minimize chances of 'SHOW SLAVE STATUS' being called between the
  time the slave is shut down and connections are shut down.

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


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged

  Added a test case for bug #12392.
item_cmpfunc.cc:
  Fixed bug #12392.
  Missing handling of rows containing NULL components
  when evaluating IN predicates caused a crash.


sql/item_cmpfunc.cc:
  Fixed bug #12392.
  Missing handling of rows containing NULL components
  when evaluating IN predicates caused a crash.
mysql-test/r/subselect.result:
  Added a test case for bug #12392.
mysql-test/t/subselect.test:
  Added a test case for bug #12392.

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

- Fixed some error condtion when handling dates with 'T'
- Added extra test for bug #11867 (Wrong result with "... WHERE ROW( a, b ) IN ( SELECT DISTINCT a, b WHERE ...)" to show it's not yet fixed
- Safety fixes and cleanups


mysql-test/r/subselect.result:
  Added extra test case to test case for bug #11867
  (Result shows that current code is not yet right and needs to be fixed)
mysql-test/r/type_datetime.result:
  More tests for dates of type CCYYMMDDTHHMMSS
mysql-test/t/subselect.test:
  Added extra test case to test case for bug #11867
mysql-test/t/type_datetime.test:
  More tests for dates of type CCYYMMDDTHHMMSS
sql-common/my_time.c:
  Fixed handling of dates of type CCYYMMDDTHHMMSS
  (Old code couldn't handle 2003-0304 or 2003-0003-02)
sql/slave.cc:
  Indentation cleanup
sql/sql_parse.cc:
  Added test of return value of get_system_var()
sql/sql_select.cc:
  Removed unnecessary call to field->table->maybe_null
sql/sql_union.cc:
  Indentation fixes

Removed unnecessary error message from mysql.cc (client program)


client/mysql.cc:
  BUG #12119
  
  The error message "Didn't find any fields in table ..." would 
  be printed out when a table was created and dropped in rapid succession 
  via a perl script. The client would get a list of tables, meanwhile, the 
  one table would be deleted, and then this error message printed when the 
  table was not found, which it should just quietly not print the fields.
  Removing the error message fixes this issue.

  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

(important for Adobe).

mf_pack.c, mf_dirname.c, charset.c, my_sys.h:

  - adding fs_character_set() function on Windows
  - ignoring fake slashes which are just multibyte
    parts in several functions in /mysys

Verified by Shu to work on WinXP and Win2k.
Test is not possible, or very hard to do.


include/my_sys.h:
  Bug#5439 : mysql_server_init() crashes if ShiftJIS path is passed
  (important for Adobe)
  - adding fs_character_set() function on Windows
  - ignoring fake slashes which are just multibyte
    parts in several functions in /mysys
mysys/charset.c:
  d
mysys/mf_dirname.c:
  d
mysys/mf_pack.c:
  d

  adding test case
item_strfunc.cc:
  Bug#12351
  CONCAT with USER()/DATEBASE() and
  a column gets strange results.
  Mark created Item_str as constant, so CONCAT
  cannot reuse it for optimization purposes.


sql/item_strfunc.cc:
  Bug#12351
  CONCAT with USER()/DATEBASE() and
  a column gets strange results
mysql-test/t/func_system.test:
  adding test case
mysql-test/r/func_system.result:
  adding test case