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


sql/mysql_priv.h:
  Auto merged

include/mysql.h:
  Cleanup
sql-common/client.c:
  Allow client.c to compile after changes to mysql.h
sql/opt_range.cc:
  Make bdb.test repeatable (and assume that table scans is a little bit slower)
sql/sql_handler.cc:
  Fixed typo during merge
sql/sql_insert.cc:
  Fixed indentation

BitKeeper/etc/ignore:
  added sql/mysql_tzinfo_to_sql
BitKeeper/etc/logging_ok:
  auto-union
acinclude.m4:
  Auto merged
extra/perror.c:
  Auto merged
include/mysql.h:
  Auto merged
innobase/include/mach0data.ic:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/mem/mem0dbg.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
BitKeeper/deleted/.del-4.0.XX-gpl.ipr~f5909a9e9bd8094:
  Auto merged
BitKeeper/deleted/.del-Clients and Tools.fgl~bf0f776883577f02:
  Auto merged
BitKeeper/deleted/.del-Development.fgl~6392ce285e73f5fc:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/innodb_cache.result:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
mysql-test/t/innodb_cache.test:
  Auto merged
mysql-test/t/lowercase_table2.test:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/handler.cc:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
libmysql/libmysql.c:
  Merge with 4.0
mysql-test/r/bdb.result:
  Merge with 4.0
mysql-test/r/range.result:
  Merge with 4.0
mysql-test/t/bdb.test:
  Merge with 4.0
mysys/hash.c:
  Merge with 4.0
scripts/mysql_install_db.sh:
  Merge with 4.0
sql/field.cc:
  Merge with 4.0
sql/field.h:
  Merge with 4.0
sql/mysql_priv.h:
  Merge with 4.0
sql/sql_handler.cc:
  Merge with 4.0
sql/sql_select.cc:
  Merge with 4.0
sql/sql_table.cc:
  Merge with 4.0

into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-fix

problems with unresolved dependancies on some platforms.


sql/mysql_priv.h:
  Moved my_time_t definitions to tztime.h to avoid mysql_tzinfo_to_sql dependancy
  on mysql_priv.h.
sql/tztime.cc:
  Removed mysql_tzinfo_to_sql dependancy from mysql_priv.h
sql/tztime.h:
  Moved my_time_t definitions to tztime.h to avoid mysql_tzinfo_to_sql dependancy
  on mysql_priv.h.

sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

scripts/make_win_binary_distribution.sh:
  Add missing .cnf files (Bug #4216)
scripts/make_win_src_distribution.sh:
  Add missing .cnf files (Bug #4216)
  Align code with MySQL 4.1

Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938)
Don't use default arguments for ha_rnd_init()
Simple code cleanups since last pull



scripts/fill_func_tables.sh:
  Change mode to -rw-rw-r--
scripts/make_win_src_distribution.sh:
  Safer remove of SCCS directories
scripts/mysql_create_system_tables.sh:
  Added missing root user to mysql.user on windows. (Bug #4242)
scripts/mysql_install_db.sh:
  Set default max_allowed_packet to be able to read help tables even if an my.cnf file with this option is present. (Bug #3938)
sql/filesort.cc:
  Don't use default arguments for ha_rnd_init()
sql/ha_berkeley.cc:
  Better to use #ifdef than // to disable code
  Removed not needed setting of active_index (It's set in index_end)
sql/ha_berkeley.h:
  Don't use default arguments for ha_rnd_init()
sql/ha_heap.h:
  Don't use default arguments for ha_rnd_init()
sql/ha_innodb.h:
  Don't use default arguments for ha_rnd_init()
sql/ha_isam.h:
  Don't use default arguments for ha_rnd_init()
sql/ha_isammrg.h:
  Don't use default arguments for ha_rnd_init()
sql/ha_myisam.cc:
  Fixed wrong previous patch (New code used 'and' between two conditions when it should be 'or' as in original code)
sql/ha_myisam.h:
  Don't use default arguments for ha_rnd_init()
sql/ha_myisammrg.h:
  Don't use default arguments for ha_rnd_init()
sql/ha_ndbcluster.h:
  Don't use default arguments for ha_rnd_init()
sql/handler.cc:
  Code cleanup
sql/handler.h:
  Keep bool variables together (better alignment)
sql/records.cc:
  Don't use default arguments for ha_rnd_init()
sql/sql_select.cc:
  Don't use default arguments for ha_rnd_init()

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

   (moved it into another BK tree instead)


BitKeeper/deleted/.del-Default.cdf~b6e79894b8a945c7:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Clients and Tools.fgl~2bbd9a12ecb9c515:
  Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.fdf~4953a6c975a34ea:
  Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~833ee740287c6f79:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Development.fgl~ac14d1ef148e8a98:
  Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Development.fgl
BitKeeper/deleted/.del-Documentation.fgl~9b6931b2da84ca08:
  Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~4e70fbbf80f7c08a:
  Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-4.0.XX-classic.ipr~300f789dff606645:
  Delete: VC++Files/InstallShield/4.0.XX-classic/4.0.XX-classic.ipr
BitKeeper/deleted/.del-Default.rge~6749c71897080659:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Registry Entries/Default.rge
BitKeeper/deleted/.del-Servers.fgl~bfa9c448fb6677a8:
  Delete: VC++Files/InstallShield/4.0.XX-classic/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~fda938d4672b152f:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~a4a8e4ff4ecb9208:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ino
BitKeeper/deleted/.del-Setup.ins~fc1164dbe4fab00a:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.ins
BitKeeper/deleted/.del-Default.shl~53f36034d502f789:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Shell Objects/Default.shl
BitKeeper/deleted/.del-Setup.obs~2c6932da5ab5d1b1:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul.old~ca45dde660f56d93:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/Setup.rul.old
BitKeeper/deleted/.del-infolist.txt~c2044c845067562f:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-setup.bmp~a94c8610ab87e06c:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
BitKeeper/deleted/.del-setup.rul~b60736dcf4dd2009:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Script Files/setup.rul
BitKeeper/deleted/.del-Build.tsb~2115a92aa9011cc0:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Clients and Tools.fgl~bf0f776883577f02:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~258c3c6c88ee9c1a:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fgl~239a3d5c75a17d6f:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Default.shl~348d0fe86c90183f:
  Delete: VC++Files/InstallShield/4.0.XX-classic/String Tables/Default.shl
BitKeeper/deleted/.del-Setup.tsb~53ee5a5dea9af84e:
  Delete: VC++Files/InstallShield/4.0.XX-classic/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-value.shl~139b49dbd00913e5:
  Delete: VC++Files/InstallShield/4.0.XX-classic/String Tables/0009-English/value.shl
BitKeeper/deleted/.del-Default.fdf~d6f33b9f4717e65c:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.rge~c514c1e9be51be19:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Registry Entries/Default.rge
BitKeeper/deleted/.del-Development.fgl~6392ce285e73f5fc:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl
BitKeeper/deleted/.del-Documentation.fgl~e9b823d7a5c391c4:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~959c4efc58bc0814:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-Servers.fgl~3a0649a7c6aadc83:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/File Groups/Servers.fgl
BitKeeper/deleted/.del-4.0.XX-gpl.ipr~f5909a9e9bd8094:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr
BitKeeper/deleted/.del-Setup.dbg~4ccb196b7d55031d:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~cdbb7d4bd8db360f:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ino
BitKeeper/deleted/.del-Setup.ins~83eb271b4c91a6ba:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~d09ce92c1e558c6e:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.obs
BitKeeper/deleted/.del-setup.rul~458000bbbdf1205e:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/setup.rul
BitKeeper/deleted/.del-Build.tsb~aff1897b9edad5e2:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Default.shl~9063a06da7f33f3:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Shell Objects/Default.shl
BitKeeper/deleted/.del-Default.shl~f3e5b5b97a54dee6:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/String Tables/Default.shl
BitKeeper/deleted/.del-Setup.rul.old~566b97cdedfedf29:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Script Files/Setup.rul.old
BitKeeper/deleted/.del-infolist.txt~674d51f7b326518b:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-setup.bmp~2e4262a3dfa4d35d:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
BitKeeper/deleted/.del-value.shl~926e24e7dc9e4e79:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/String Tables/0009-English/value.shl
BitKeeper/deleted/.del-Clients and Tools.fgl~14feac1c737b4104:
  Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~49cc1dec1e65c351:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fdf~34238898d44490:
  Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~aa69adc3d2c9d8e:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Development.fgl~d2fa1510dfb65f72:
  Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Development.fgl
BitKeeper/deleted/.del-Setup.tsb~72f2ecdeb296ae24:
  Delete: VC++Files/InstallShield/4.0.XX-gpl/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-4.0.XX-pro.ipr~af4304a46891ea4f:
  Delete: VC++Files/InstallShield/4.0.XX-pro/4.0.XX-pro.ipr
BitKeeper/deleted/.del-Default.rge~5b912d9ca1ac7bca:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Registry Entries/Default.rge
BitKeeper/deleted/.del-Documentation.fgl~77f5dc6633481f26:
  Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~11f1ba8dd2959c0:
  Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-Servers.fgl~23867318e40f08ab:
  Delete: VC++Files/InstallShield/4.0.XX-pro/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~bc0ea214cda7c317:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~428cd086735edb:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ino
BitKeeper/deleted/.del-Setup.ins~cca39d17ddbeb287:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~5350fafc16a5f824:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul.old~cda35eff331ba28:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/Setup.rul.old
BitKeeper/deleted/.del-infolist.txt~dac49e5a74c0bc49:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-setup.rul~7e5ceffa1633b324:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Script Files/setup.rul
BitKeeper/deleted/.del-Build.tsb~feef4151eb46197c:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Default.shl~756db7a4f061ef5a:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Shell Objects/Default.shl
BitKeeper/deleted/.del-Default.shl~8442d4f931175ce4:
  Delete: VC++Files/InstallShield/4.0.XX-pro/String Tables/Default.shl
BitKeeper/deleted/.del-Setup.tsb~f72bf507743c85a:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-setup.bmp~12a72abe3e2d4504:
  Delete: VC++Files/InstallShield/4.0.XX-pro/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
BitKeeper/deleted/.del-value.shl~79f89b845796b76f:
  Delete: VC++Files/InstallShield/4.0.XX-pro/String Tables/0009-English/value.shl
BitKeeper/deleted/.del-Clients and Tools.fgl~105c8773e185916b:
  Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~21d59372769a480b:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fdf~bae55f5ef75fb20:
  Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~9ff0bebf571edd92:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Development.fgl~a4bf062672f150ab:
  Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Development.fgl
BitKeeper/deleted/.del-Documentation.fgl~93cd161ff57066b7:
  Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~fad9ca55f7f65bd8:
  Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-4.1.XX-classic.ipr~ab85e2e8f9fba85f:
  Delete: VC++Files/InstallShield/4.1.XX-classic/4.1.XX-classic.ipr
BitKeeper/deleted/.del-Servers.fgl~8660bf8e58bb8c46:
  Delete: VC++Files/InstallShield/4.1.XX-classic/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~c9d441dd9eab9848:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~b11e1526c27a69ac:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/Setup.ino
BitKeeper/deleted/.del-Setup.ins~2aa4ceafa981c904:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~e616ceb8e2f038b:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/Setup.obs
BitKeeper/deleted/.del-Default.shl~a62e3dc1dbd86b19:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Shell Objects/Default.shl
BitKeeper/deleted/.del-Setup.rul.old~ebca9651260dc1e:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/Setup.rul.old
BitKeeper/deleted/.del-infolist.txt~7bf03fefb6c8d966:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-setup.bmp~fb43da1cf301abc0:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
BitKeeper/deleted/.del-setup.rul~d4ed758f1dfd1aea:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Script Files/setup.rul
BitKeeper/deleted/.del-Build.tsb~a33d3beb4a03d10a:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Clients and Tools.fgl~bfb5a5bca615aa7b:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~2acf82e34190f422:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fgl~2ca50676b41365a1:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Default.shl~97ed43aad5287eb3:
  Delete: VC++Files/InstallShield/4.1.XX-classic/String Tables/Default.shl
BitKeeper/deleted/.del-Setup.tsb~7f688fa1a1305779:
  Delete: VC++Files/InstallShield/4.1.XX-classic/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-value.shl~91651502780ef02d:
  Delete: VC++Files/InstallShield/4.1.XX-classic/String Tables/0009-English/value.shl
BitKeeper/deleted/.del-Default.fdf~ecc75c1fdcbe199:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.rge~aa8ec10d20cc2ea6:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Registry Entries/Default.rge
BitKeeper/deleted/.del-Development.fgl~4212e9d59f5dded6:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Development.fgl
BitKeeper/deleted/.del-Documentation.fgl~d3b32a44ccef30cf:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~c4d1d3c2196ba489:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-Servers.fgl~3c93fd095c43d910:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/File Groups/Servers.fgl
BitKeeper/deleted/.del-4.1.XX-gpl.ipr~1ef9c8dd6b2c260a:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/4.1.XX-gpl.ipr
BitKeeper/deleted/.del-Setup.dbg~50904d3a4c3ce326:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~ec4ed614ca648f0c:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/Setup.ino
BitKeeper/deleted/.del-Setup.ins~77fa34bac070a42f:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~523a1459782433bf:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/Setup.obs
BitKeeper/deleted/.del-Default.shl~fd30955919785bdc:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Shell Objects/Default.shl
BitKeeper/deleted/.del-Setup.rul.old~248669ae84dc238b:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/Setup.rul.old
BitKeeper/deleted/.del-infolist.txt~ea6e889113272829:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-setup.bmp~f86070b6f6eae728:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
BitKeeper/deleted/.del-setup.rul~da60fc2eeb0a2b65:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Script Files/setup.rul
BitKeeper/deleted/.del-value.shl~76bc7b15a3f85461:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/String Tables/0009-English/value.shl
BitKeeper/deleted/.del-Build.tsb~90ad5f0b7f8ac7d4:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Clients and Tools.fgl~1b0f3a93a76880b6:
  Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Clients and Tools.fgl
BitKeeper/deleted/.del-Default.cdf~7223553f7189e23c:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Component Definitions/Default.cdf
BitKeeper/deleted/.del-Default.fdf~5ceb672212520fa2:
  Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Default.fdf
BitKeeper/deleted/.del-Default.fgl~15216384a36ae045:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Component Definitions/Default.fgl
BitKeeper/deleted/.del-Default.shl~4c733f5e5a550568:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/String Tables/Default.shl
BitKeeper/deleted/.del-Development.fgl~ed903f815ee63bcb:
  Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Development.fgl
BitKeeper/deleted/.del-Setup.tsb~f8934afe5f574bdd:
  Delete: VC++Files/InstallShield/4.1.XX-gpl/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-4.1.XX-pro.ipr~d3a8737b2c663290:
  Delete: VC++Files/InstallShield/4.1.XX-pro/4.1.XX-pro.ipr
BitKeeper/deleted/.del-Default.rge~182983f3c2d89dd:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Registry Entries/Default.rge
BitKeeper/deleted/.del-Documentation.fgl~d9e4c6ada79d1bac:
  Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Documentation.fgl
BitKeeper/deleted/.del-Grant Tables.fgl~47169111ae90357a:
  Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Grant Tables.fgl
BitKeeper/deleted/.del-Servers.fgl~d05b8c0ae046fa41:
  Delete: VC++Files/InstallShield/4.1.XX-pro/File Groups/Servers.fgl
BitKeeper/deleted/.del-Setup.dbg~212d5bfdb120acb6:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~38f5a71ce8fcbe9:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/Setup.ino
BitKeeper/deleted/.del-Setup.ins~96063fd05aef5bdd:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~64620a6aef850ccd:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul.old~9030a494640d6daa:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/Setup.rul.old
BitKeeper/deleted/.del-infolist.txt~c82d6e1266aed24c:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Setup Files/Compressed Files/Language Independent/OS Independent/infolist.txt
BitKeeper/deleted/.del-setup.rul~d2b63cdb81ac804d:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Script Files/setup.rul
BitKeeper/deleted/.del-Build.tsb~3ad8803f587e4caa:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Text Substitutions/Build.tsb
BitKeeper/deleted/.del-Default.shl~49bfb4a6b7be3ae6:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Shell Objects/Default.shl
BitKeeper/deleted/.del-Default.shl~dfd37ac3a14f1c26:
  Delete: VC++Files/InstallShield/4.1.XX-pro/String Tables/Default.shl
BitKeeper/deleted/.del-Setup.tsb~cbf0b4216f1fc07a:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Text Substitutions/Setup.tsb
BitKeeper/deleted/.del-setup.bmp~c14772c028869268:
  Delete: VC++Files/InstallShield/4.1.XX-pro/Setup Files/Uncompressed Files/Language Independent/OS Independent/setup.bmp
BitKeeper/deleted/.del-value.shl~358b883967c1285b:
  Delete: VC++Files/InstallShield/4.1.XX-pro/String Tables/0009-English/value.shl
BitKeeper/deleted/.del-Setup.dbg~cd24ecd832b2e2f:
  Delete: VC++Files/InstallShield/Script Files/Setup.dbg
BitKeeper/deleted/.del-Setup.ino~b3932b7bb121e4ec:
  Delete: VC++Files/InstallShield/Script Files/Setup.ino
BitKeeper/deleted/.del-Setup.ins~f3a796be563fc9bd:
  Delete: VC++Files/InstallShield/Script Files/Setup.ins
BitKeeper/deleted/.del-Setup.obs~4fd60fb740a22ea:
  Delete: VC++Files/InstallShield/Script Files/Setup.obs
BitKeeper/deleted/.del-Setup.rul~4b7637f769f52a25:
  Delete: VC++Files/InstallShield/Script Files/Setup.rul

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

myisammrg/myrg_write.c:
  set info->current_table correctly
mysql-test/r/merge.result:
  bug#4008
mysql-test/t/merge.test:
  bug#4008

into mysql.com:/home/mydev/mysql-4.0-bug2686

mysql-test/r/ps.result:
  parameters from variables (for field creation)
mysql-test/t/ps.test:
  parameters from variables (for field creation)
sql/item.cc:
  type of parameter assignment for parameters from variables
sql/item.h:
  removed spaces at line ends in Item_param definition

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


sql/sql_select.cc:
  Auto merged

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

Bug#3808 - fulltext index, delete, 2-level tree, the word on the 1st level has different length than the key (latin1_german2_ci)

sql/ha_berkeley.cc:
  Auto merged
mysql-test/r/bdb.result:
  SCCS merged
mysql-test/t/bdb.test:
  SCCS merged

into mysql.com:/home/mydev/mysql-4.0-bug3565


sql/sql_table.cc:
  Auto merged

compile even without InnoDB


mysql-test/t/system_mysql_db_fix.test:
  remove ^M's
mysql-test/t/system_mysql_db_refs.test:
  remove ^M's
sql/mysqld.cc:
  compile even without InnoDB !

mysql-test/r/ps.result:
  test of prepared EXPLAIN
mysql-test/t/ps.test:
  fix layout and table removing of previous tests
  test of prepared EXPLAIN
sql/sql_prepare.cc:
  explain pave to be prepared, too
  cleanup options after explain execution
sql/sql_select.cc:
  removed unneed assignment

  new file

Add my_time.h to list of headers which should be put ot include/ during make dist.


include/Makefile.am:
  Add my_time.h to list of headers which should be put ot include/ during make dist.

anybody knows how to distinguish 2.95.3 from 2.95.4 (which is ok) ?

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

sql/ha_myisam.h:
  - max_supported_key_part_length() is const now
sql/ha_myisammrg.h:
  - max_supported_key_part_length() is const now
sql/handler.h:
  - max_supported_key_part_length() is const now
  - removed warning about wrong order of initializer in handler ocnstructor.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/kostja/mysql/mysql-4.1-root

into eagle.mysql.r18.ru:/home/vva/work/BUG_1851/mysql-4.1


client/mysqldump.c:
  Auto merged

an error code if the output device is filled"

sql/sql_parse.cc:
  parameter of my_yyoverflow made independed from YYSIZE_T
sql/sql_yacc.yy:
  parameter of my_yyoverflow made independed from YYSIZE_T