mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15461 commits 2784 branches 343 tags 1.6 GiB
Commit graph

15461 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
64155e3cbb Added option --sigint-ignore to mysql.cc 2004-10-07 22:47:11 +03:00
unknown
26f348c910 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into a80-186-41-201.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
client/mysqladmin.c:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
 2004-10-07 22:09:14 +03:00
unknown
d39ea1fdad Fixed a bug in password handling. All related to Bug#5955. 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-10-07 22:08:17 +03:00
unknown
7efa215e25 Many files: 
Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)


sql/ha_innodb.cc:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
innobase/row/row0mysql.c:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
innobase/fil/fil0fil.c:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
innobase/dict/dict0crea.c:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
innobase/dict/dict0dict.c:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
innobase/dict/dict0load.c:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
innobase/dict/dict0mem.c:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
innobase/include/mem0mem.ic:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
innobase/include/dict0mem.h:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
innobase/include/fil0fil.h:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
innobase/include/mem0mem.h:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
innobase/mem/mem0mem.c:
  Fix bug #5137: if innodb_file_per_table was specified, CREATE TEMPORARY TABLE ... TYPE=InnoDB said that cannot find path specified, and made mysqld to exit(1)
 2004-10-07 20:53:20 +03:00
unknown
66bdcf8439 Fixed Bug#5575, mysqlhotcopy is broken when using --noindices 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-10-07 20:30:30 +03:00
unknown
1d7406c6c8 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
 2004-10-07 19:00:08 +02:00
unknown
992ce20f37 ha_ndbcluster.cc: 
merge error


sql/ha_ndbcluster.cc:
  merge error
 2004-10-07 17:00:07 +00:00
unknown
05e45be511 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
 2004-10-07 16:57:53 +00:00
unknown
5a390c9c70 - removed the Docs/Flags and Docs/RawFlags directories 
- Updated Docs/Makefile.am and scripts/make_win_src_distribution.sh
   accordingly


BitKeeper/deleted/.del-denmark.eps~67c559554779943c:
  Delete: Docs/Flags/denmark.eps
BitKeeper/deleted/.del-denmark.gif~794733445761c7d9:
  Delete: Docs/Flags/denmark.gif
BitKeeper/deleted/.del-denmark.pdf~772f1f647f6675b4:
  Delete: Docs/Flags/denmark.pdf
BitKeeper/deleted/.del-belgium.eps~10f1218e783cadb5:
  Delete: Docs/Flags/belgium.eps
BitKeeper/deleted/.del-belgium.gif~47e115c2f692a300:
  Delete: Docs/Flags/belgium.gif
BitKeeper/deleted/.del-denmark.txt~9467854a287a11d3:
  Delete: Docs/Flags/denmark.txt
BitKeeper/deleted/.del-belgium.pdf~d66d1f4d161dbfa7:
  Delete: Docs/Flags/belgium.pdf
BitKeeper/deleted/.del-belgium.txt~1cc4ae60f07ea525:
  Delete: Docs/Flags/belgium.txt
BitKeeper/deleted/.del-costa-rica.eps~3999b27ab2e876c5:
  Delete: Docs/Flags/costa-rica.eps
BitKeeper/deleted/.del-costa-rica.gif~e4f609b46043b612:
  Delete: Docs/Flags/costa-rica.gif
BitKeeper/deleted/.del-costa-rica.pdf~ad1185a29a583cff:
  Delete: Docs/Flags/costa-rica.pdf
BitKeeper/deleted/.del-costa-rica.txt~fc47cc5846cde0c1:
  Delete: Docs/Flags/costa-rica.txt
BitKeeper/deleted/.del-france.eps~54769290ec25c3f8:
  Delete: Docs/Flags/france.eps
BitKeeper/deleted/.del-france.gif~31e0b62070c6d14f:
  Delete: Docs/Flags/france.gif
BitKeeper/deleted/.del-france.pdf~2f143b49353abb46:
  Delete: Docs/Flags/france.pdf
BitKeeper/deleted/.del-france.txt~fe93e7e98b8daec0:
  Delete: Docs/Flags/france.txt
BitKeeper/deleted/.del-sweden.eps~4c24b952feb3ab:
  Delete: Docs/Flags/sweden.eps
BitKeeper/deleted/.del-sweden.gif~8653c24f7bac88dc:
  Delete: Docs/Flags/sweden.gif
BitKeeper/deleted/.del-sweden.pdf~4afd5afe76bd9172:
  Delete: Docs/Flags/sweden.pdf
BitKeeper/deleted/.del-sweden.txt~b6d9f06fa227065d:
  Delete: Docs/Flags/sweden.txt
BitKeeper/deleted/.del-turkey.eps~6e9ebd6992e53d70:
  Delete: Docs/Flags/turkey.eps
BitKeeper/deleted/.del-turkey.gif~cb55d42965e9f824:
  Delete: Docs/Flags/turkey.gif
BitKeeper/deleted/.del-turkey.pdf~287742544b50b431:
  Delete: Docs/Flags/turkey.pdf
BitKeeper/deleted/.del-turkey.txt~bc65755bf8a2a21:
  Delete: Docs/Flags/turkey.txt
BitKeeper/deleted/.del-ukraine.eps~f450a951bf5c4dc9:
  Delete: Docs/Flags/ukraine.eps
BitKeeper/deleted/.del-ukraine.gif~d167f4bf9179141d:
  Delete: Docs/Flags/ukraine.gif
BitKeeper/deleted/.del-ukraine.pdf~d3b480f6acf3b56a:
  Delete: Docs/Flags/ukraine.pdf
BitKeeper/deleted/.del-ukraine.txt~e4c1066096a8b1b3:
  Delete: Docs/Flags/ukraine.txt
BitKeeper/deleted/.del-ireland.eps~9c52bfd977d47d1a:
  Delete: Docs/Flags/ireland.eps
BitKeeper/deleted/.del-ireland.gif~3a5ffafd74c67fe:
  Delete: Docs/Flags/ireland.gif
BitKeeper/deleted/.del-ireland.pdf~e459dd3a1de0f8c7:
  Delete: Docs/Flags/ireland.pdf
BitKeeper/deleted/.del-ireland.txt~c8a9f56f150f1008:
  Delete: Docs/Flags/ireland.txt
BitKeeper/deleted/.del-bulgaria.eps~58ae212ad442ecb7:
  Delete: Docs/Flags/bulgaria.eps
BitKeeper/deleted/.del-indonesia.eps~ca7ee0a66154d34d:
  Delete: Docs/Flags/indonesia.eps
BitKeeper/deleted/.del-indonesia.gif~2137016b86bc5d07:
  Delete: Docs/Flags/indonesia.gif
BitKeeper/deleted/.del-indonesia.pdf~f14b2f53c85a43d:
  Delete: Docs/Flags/indonesia.pdf
BitKeeper/deleted/.del-indonesia.txt~cae5c380959a5460:
  Delete: Docs/Flags/indonesia.txt
BitKeeper/deleted/.del-bulgaria.gif~859289ca21a394b:
  Delete: Docs/Flags/bulgaria.gif
BitKeeper/deleted/.del-bulgaria.pdf~fdcd6f1b96d36f5b:
  Delete: Docs/Flags/bulgaria.pdf
BitKeeper/deleted/.del-bulgaria.txt~8d3854c355db697e:
  Delete: Docs/Flags/bulgaria.txt
BitKeeper/deleted/.del-singapore.eps~1efd8578def570d8:
  Delete: Docs/Flags/singapore.eps
BitKeeper/deleted/.del-italy.eps~4c8a4d9f1e6fe897:
  Delete: Docs/Flags/italy.eps
BitKeeper/deleted/.del-italy.gif~43074800bb72a037:
  Delete: Docs/Flags/italy.gif
BitKeeper/deleted/.del-singapore.gif~78f227e1f0129a:
  Delete: Docs/Flags/singapore.gif
BitKeeper/deleted/.del-singapore.pdf~77019ac12b0d44b0:
  Delete: Docs/Flags/singapore.pdf
BitKeeper/deleted/.del-singapore.txt~21978a833ace2d2:
  Delete: Docs/Flags/singapore.txt
BitKeeper/deleted/.del-italy.pdf~ae8671649b09cb96:
  Delete: Docs/Flags/italy.pdf
BitKeeper/deleted/.del-italy.txt~428bb945a2576671:
  Delete: Docs/Flags/italy.txt
BitKeeper/deleted/.del-slovenia.eps~f73ea56aafc02828:
  Delete: Docs/Flags/slovenia.eps
BitKeeper/deleted/.del-slovenia.gif~353783f82c89c7c8:
  Delete: Docs/Flags/slovenia.gif
BitKeeper/deleted/.del-slovenia.pdf~349905c733fcc8a:
  Delete: Docs/Flags/slovenia.pdf
BitKeeper/deleted/.del-slovenia.txt~21996e7d83808d0f:
  Delete: Docs/Flags/slovenia.txt
BitKeeper/deleted/.del-usa.eps~64e6c5fe46d1929d:
  Delete: Docs/Flags/usa.eps
BitKeeper/deleted/.del-usa.gif~278102a819343b97:
  Delete: Docs/Flags/usa.gif
BitKeeper/deleted/.del-usa.pdf~ed44efa3b0c6f6ed:
  Delete: Docs/Flags/usa.pdf
BitKeeper/deleted/.del-usa.txt~2792ba8db79f0a39:
  Delete: Docs/Flags/usa.txt
BitKeeper/deleted/.del-greece.eps~30dd253c6047f42f:
  Delete: Docs/Flags/greece.eps
BitKeeper/deleted/.del-greece.gif~d2a46be5950e4784:
  Delete: Docs/Flags/greece.gif
BitKeeper/deleted/.del-greece.pdf~e61ed027c4d629:
  Delete: Docs/Flags/greece.pdf
BitKeeper/deleted/.del-greece.txt~5c5b5ddbb62811c9:
  Delete: Docs/Flags/greece.txt
BitKeeper/deleted/.del-philippines.eps~64beb8e0853db8b2:
  Delete: Docs/Flags/philippines.eps
BitKeeper/deleted/.del-philippines.gif~6cf82c24f6baef53:
  Delete: Docs/Flags/philippines.gif
BitKeeper/deleted/.del-philippines.pdf~b7977a895a0f6a76:
  Delete: Docs/Flags/philippines.pdf
BitKeeper/deleted/.del-philippines.txt~f42e0270d8e22325:
  Delete: Docs/Flags/philippines.txt
BitKeeper/deleted/.del-portugal.eps~98b9150ce6a649b8:
  Delete: Docs/Flags/portugal.eps
BitKeeper/deleted/.del-portugal.gif~c7cc13bb1c6dfe9d:
  Delete: Docs/Flags/portugal.gif
BitKeeper/deleted/.del-portugal.pdf~24587f586bc7534b:
  Delete: Docs/Flags/portugal.pdf
BitKeeper/deleted/.del-portugal.txt~b3286118e0bfcc3:
  Delete: Docs/Flags/portugal.txt
BitKeeper/deleted/.del-mexico.eps~9186bd67f1a25a3f:
  Delete: Docs/Flags/mexico.eps
BitKeeper/deleted/.del-mexico.gif~a749e257ffeb6588:
  Delete: Docs/Flags/mexico.gif
BitKeeper/deleted/.del-austria.eps~8e6934b528c7ba65:
  Delete: Docs/Flags/austria.eps
BitKeeper/deleted/.del-mexico.pdf~a0b20871c2e61325:
  Delete: Docs/Flags/mexico.pdf
BitKeeper/deleted/.del-mexico.txt~a776cf3478c85e68:
  Delete: Docs/Flags/mexico.txt
BitKeeper/deleted/.del-austria.gif~4b528a1b567629c1:
  Delete: Docs/Flags/austria.gif
BitKeeper/deleted/.del-austria.pdf~88115eca98801ee1:
  Delete: Docs/Flags/austria.pdf
BitKeeper/deleted/.del-austria.txt~eabda07c94bc3783:
  Delete: Docs/Flags/austria.txt
BitKeeper/deleted/.del-canada.eps~870d51433272b91e:
  Delete: Docs/Flags/canada.eps
BitKeeper/deleted/.del-canada.gif~2b36f4f336fcbdd7:
  Delete: Docs/Flags/canada.gif
BitKeeper/deleted/.del-canada.pdf~7aa6ddfa4274a503:
  Delete: Docs/Flags/canada.pdf
BitKeeper/deleted/.del-canada.txt~c877dedbb6500f48:
  Delete: Docs/Flags/canada.txt
BitKeeper/deleted/.del-iceland.eps~9cc02c4e666e803:
  Delete: Docs/Flags/iceland.eps
BitKeeper/deleted/.del-iceland.gif~902645739e3c6b75:
  Delete: Docs/Flags/iceland.gif
BitKeeper/deleted/.del-iceland.pdf~da00f08b9f794a92:
  Delete: Docs/Flags/iceland.pdf
BitKeeper/deleted/.del-iceland.txt~dd6b3c03d0e35936:
  Delete: Docs/Flags/iceland.txt
BitKeeper/deleted/.del-japan.eps~fe89aea87d627e85:
  Delete: Docs/Flags/japan.eps
BitKeeper/deleted/.del-hungary.eps~a7d682f15e7be0ea:
  Delete: Docs/Flags/hungary.eps
BitKeeper/deleted/.del-hungary.gif~373325ba9bcbdc72:
  Delete: Docs/Flags/hungary.gif
BitKeeper/deleted/.del-japan.gif~1c6f45454aa378b3:
  Delete: Docs/Flags/japan.gif
BitKeeper/deleted/.del-japan.pdf~40532606f6053145:
  Delete: Docs/Flags/japan.pdf
BitKeeper/deleted/.del-japan.txt~114edadc3ac11a71:
  Delete: Docs/Flags/japan.txt
BitKeeper/deleted/.del-hungary.pdf~918baeb6bf07fa97:
  Delete: Docs/Flags/hungary.pdf
BitKeeper/deleted/.del-hungary.txt~c65c28ecc13cee38:
  Delete: Docs/Flags/hungary.txt
BitKeeper/deleted/.del-russia.eps~653c84cd2a80b954:
  Delete: Docs/Flags/russia.eps
BitKeeper/deleted/.del-russia.gif~300890a87b30d01e:
  Delete: Docs/Flags/russia.gif
BitKeeper/deleted/.del-latvia.eps~6a6307d66a0cb07:
  Delete: Docs/Flags/latvia.eps
BitKeeper/deleted/.del-russia.pdf~7fe386a4e48f013:
  Delete: Docs/Flags/russia.pdf
BitKeeper/deleted/.del-russia.txt~91dea186f11d7fdc:
  Delete: Docs/Flags/russia.txt
BitKeeper/deleted/.del-armenia.eps~643f5c261ebab928:
  Delete: Docs/Flags/armenia.eps
BitKeeper/deleted/.del-latvia.gif~abbe57eb4438c6e8:
  Delete: Docs/Flags/latvia.gif
BitKeeper/deleted/.del-latvia.pdf~25516993d39fa760:
  Delete: Docs/Flags/latvia.pdf
BitKeeper/deleted/.del-latvia.txt~193a3991e0eddaf9:
  Delete: Docs/Flags/latvia.txt
BitKeeper/deleted/.del-armenia.gif~38bb7a3d6a564ecc:
  Delete: Docs/Flags/armenia.gif
BitKeeper/deleted/.del-armenia.txt~9b07e8896669b144:
  Delete: Docs/Flags/armenia.txt
BitKeeper/deleted/.del-new-zealand.eps~861b5316178fcb08:
  Delete: Docs/Flags/new-zealand.eps
BitKeeper/deleted/.del-new-zealand.gif~77ea426c11bb3ab:
  Delete: Docs/Flags/new-zealand.gif
BitKeeper/deleted/.del-new-zealand.pdf~ceb107c0ae812a14:
  Delete: Docs/Flags/new-zealand.pdf
BitKeeper/deleted/.del-new-zealand.txt~f52fdd9690b63ac0:
  Delete: Docs/Flags/new-zealand.txt
BitKeeper/deleted/.del-argentina.eps~79d033cbfba0697a:
  Delete: Docs/Flags/argentina.eps
BitKeeper/deleted/.del-argentina.gif~4fc28afb8cb08692:
  Delete: Docs/Flags/argentina.gif
BitKeeper/deleted/.del-argentina.pdf~83fcf14b727ae306:
  Delete: Docs/Flags/argentina.pdf
BitKeeper/deleted/.del-argentina.txt~75de5b063d1a1560:
  Delete: Docs/Flags/argentina.txt
BitKeeper/deleted/.del-germany.eps~8ec02ead1a75bbfb:
  Delete: Docs/Flags/germany.eps
BitKeeper/deleted/.del-germany.gif~7c2750867600a157:
  Delete: Docs/Flags/germany.gif
BitKeeper/deleted/.del-croatia.eps~621866ebf8db9526:
  Delete: Docs/Flags/croatia.eps
BitKeeper/deleted/.del-croatia.gif~d48555c97fa6e7b0:
  Delete: Docs/Flags/croatia.gif
BitKeeper/deleted/.del-croatia.txt~55d9c2aaec850113:
  Delete: Docs/Flags/croatia.txt
BitKeeper/deleted/.del-germany.pdf~aca678db2fc30f2f:
  Delete: Docs/Flags/germany.pdf
BitKeeper/deleted/.del-germany.txt~d73791b0314d5343:
  Delete: Docs/Flags/germany.txt
BitKeeper/deleted/.del-poland.eps~8be27a5447e3a146:
  Delete: Docs/Flags/poland.eps
BitKeeper/deleted/.del-poland.gif~bcbc9ed9b75fcd3c:
  Delete: Docs/Flags/poland.gif
BitKeeper/deleted/.del-poland.pdf~e71f4eaa53f33cd:
  Delete: Docs/Flags/poland.pdf
BitKeeper/deleted/.del-poland.txt~e484ca6c9feb9080:
  Delete: Docs/Flags/poland.txt
BitKeeper/deleted/.del-spain.eps~a798dd1293a30b7c:
  Delete: Docs/Flags/spain.eps
BitKeeper/deleted/.del-spain.gif~345db1228c3a5477:
  Delete: Docs/Flags/spain.gif
BitKeeper/deleted/.del-spain.pdf~a25de45d2ded91ed:
  Delete: Docs/Flags/spain.pdf
BitKeeper/deleted/.del-spain.txt~4b3da48f41bfa958:
  Delete: Docs/Flags/spain.txt
BitKeeper/deleted/.del-yugoslavia.eps~b9bab90d98a3de45:
  Delete: Docs/Flags/yugoslavia.eps
BitKeeper/deleted/.del-yugoslavia.gif~d58992747df26331:
  Delete: Docs/Flags/yugoslavia.gif
BitKeeper/deleted/.del-yugoslavia.pdf~978eeff094d4a57e:
  Delete: Docs/Flags/yugoslavia.pdf
BitKeeper/deleted/.del-yugoslavia.txt~cd146d758c75e6ab:
  Delete: Docs/Flags/yugoslavia.txt
BitKeeper/deleted/.del-netherlands.eps~2012cff48c4d9368:
  Delete: Docs/Flags/netherlands.eps
BitKeeper/deleted/.del-netherlands.gif~d788dc4e9afd2f8a:
  Delete: Docs/Flags/netherlands.gif
BitKeeper/deleted/.del-netherlands.pdf~4833162b30912e1:
  Delete: Docs/Flags/netherlands.pdf
BitKeeper/deleted/.del-netherlands.txt~214c2cbb9ac7db0a:
  Delete: Docs/Flags/netherlands.txt
BitKeeper/deleted/.del-south-africa.eps~4f647997f3f26988:
  Delete: Docs/Flags/south-africa.eps
BitKeeper/deleted/.del-south-africa.gif~8ef88d69ba7c794:
  Delete: Docs/Flags/south-africa.gif
BitKeeper/deleted/.del-south-africa.pdf~ef7f63c8153ef8d5:
  Delete: Docs/Flags/south-africa.pdf
BitKeeper/deleted/.del-south-africa.txt~4674c3b1a39d79c9:
  Delete: Docs/Flags/south-africa.txt
BitKeeper/deleted/.del-romania.eps~d197860bb0edbd64:
  Delete: Docs/Flags/romania.eps
BitKeeper/deleted/.del-romania.gif~8c5ad831482c31e3:
  Delete: Docs/Flags/romania.gif
BitKeeper/deleted/.del-romania.pdf~322c2e57ce6ceed:
  Delete: Docs/Flags/romania.pdf
BitKeeper/deleted/.del-romania.txt~c716fe6568110738:
  Delete: Docs/Flags/romania.txt
BitKeeper/deleted/.del-australia.eps~c3f5a8e36f6a6772:
  Delete: Docs/Flags/australia.eps
BitKeeper/deleted/.del-australia.gif~56f9808ee943fac:
  Delete: Docs/Flags/australia.gif
BitKeeper/deleted/.del-australia.pdf~e7a39134644c310c:
  Delete: Docs/Flags/australia.pdf
BitKeeper/deleted/.del-australia.txt~88eae38ad0a29a9b:
  Delete: Docs/Flags/australia.txt
BitKeeper/deleted/.del-south-korea.eps~9c944ac52a247665:
  Delete: Docs/Flags/south-korea.eps
BitKeeper/deleted/.del-south-korea.gif~f0fe17a9495664c9:
  Delete: Docs/Flags/south-korea.gif
BitKeeper/deleted/.del-south-korea.pdf~24496add674f1d6:
  Delete: Docs/Flags/south-korea.pdf
BitKeeper/deleted/.del-czech-republic.eps~3a16711ce569e4f7:
  Delete: Docs/Flags/czech-republic.eps
BitKeeper/deleted/.del-south-korea.txt~93c9adabe5ac3339:
  Delete: Docs/Flags/south-korea.txt
BitKeeper/deleted/.del-czech-republic.gif~3cdfb4447c89fb7a:
  Delete: Docs/Flags/czech-republic.gif
BitKeeper/deleted/.del-czech-republic.pdf~6185b7b29cf21c20:
  Delete: Docs/Flags/czech-republic.pdf
BitKeeper/deleted/.del-czech-republic.txt~f35c3417f35bb917:
  Delete: Docs/Flags/czech-republic.txt
BitKeeper/deleted/.del-israel.eps~43ecb6f31dcfe2f3:
  Delete: Docs/Flags/israel.eps
BitKeeper/deleted/.del-israel.gif~f503ea92490b42da:
  Delete: Docs/Flags/israel.gif
BitKeeper/deleted/.del-chile.eps~6b4470792773d5f9:
  Delete: Docs/Flags/chile.eps
BitKeeper/deleted/.del-israel.txt~4430c078ea12b98e:
  Delete: Docs/Flags/israel.txt
BitKeeper/deleted/.del-chile.gif~5f7700a1414fba60:
  Delete: Docs/Flags/chile.gif
BitKeeper/deleted/.del-chile.pdf~3ccf0b62c48e0eb8:
  Delete: Docs/Flags/chile.pdf
BitKeeper/deleted/.del-chile.txt~c143167238e9db34:
  Delete: Docs/Flags/chile.txt
BitKeeper/deleted/.del-estonia.eps~476ee9951ed567a6:
  Delete: Docs/Flags/estonia.eps
BitKeeper/deleted/.del-estonia.gif~d5dbe214eadc22f9:
  Delete: Docs/Flags/estonia.gif
BitKeeper/deleted/.del-estonia.pdf~152b980e58ddfe95:
  Delete: Docs/Flags/estonia.pdf
BitKeeper/deleted/.del-estonia.txt~fbabf17caf23c74:
  Delete: Docs/Flags/estonia.txt
BitKeeper/deleted/.del-china.eps~e27e42602de3ded7:
  Delete: Docs/Flags/china.eps
BitKeeper/deleted/.del-china.gif~a6df3c22685c50fd:
  Delete: Docs/Flags/china.gif
BitKeeper/deleted/.del-china.pdf~b3524c4313aeb4f4:
  Delete: Docs/Flags/china.pdf
BitKeeper/deleted/.del-china.txt~f2c436ae8409252:
  Delete: Docs/Flags/china.txt
BitKeeper/deleted/.del-norway.eps~b37c98d87edd8de:
  Delete: Docs/Flags/norway.eps
BitKeeper/deleted/.del-norway.gif~1d881d2af6c4e413:
  Delete: Docs/Flags/norway.gif
BitKeeper/deleted/.del-norway.pdf~980b935627182fb9:
  Delete: Docs/Flags/norway.pdf
BitKeeper/deleted/.del-norway.txt~2844906ae717ea7a:
  Delete: Docs/Flags/norway.txt
BitKeeper/deleted/.del-finland.eps~ababe64096bc701e:
  Delete: Docs/Flags/finland.eps
BitKeeper/deleted/.del-finland.gif~31a9c03ceac484df:
  Delete: Docs/Flags/finland.gif
BitKeeper/deleted/.del-finland.pdf~aab3e414da9754ab:
  Delete: Docs/Flags/finland.pdf
BitKeeper/deleted/.del-finland.txt~de31f3046646f95:
  Delete: Docs/Flags/finland.txt
BitKeeper/deleted/.del-great-britain.eps~69bd9bdc60b3b71b:
  Delete: Docs/Flags/great-britain.eps
BitKeeper/deleted/.del-great-britain.gif~94507aceb6ea0298:
  Delete: Docs/Flags/great-britain.gif
BitKeeper/deleted/.del-great-britain.pdf~b425328dc4073027:
  Delete: Docs/Flags/great-britain.pdf
BitKeeper/deleted/.del-great-britain.txt~c1362455ef389db2:
  Delete: Docs/Flags/great-britain.txt
BitKeeper/deleted/.del-brazil.eps~d11dc8c39b1b52ed:
  Delete: Docs/Flags/brazil.eps
BitKeeper/deleted/.del-brazil.gif~43080d754a1f66c3:
  Delete: Docs/Flags/brazil.gif
BitKeeper/deleted/.del-brazil.txt~82fed449c34f3150:
  Delete: Docs/Flags/brazil.txt
BitKeeper/deleted/.del-switzerland.eps~7811f8473ff72b6e:
  Delete: Docs/Flags/switzerland.eps
BitKeeper/deleted/.del-switzerland.gif~dabb711999e3126d:
  Delete: Docs/Flags/switzerland.gif
BitKeeper/deleted/.del-switzerland.pdf~ec02533fefb5071d:
  Delete: Docs/Flags/switzerland.pdf
BitKeeper/deleted/.del-switzerland.txt~e09c851d69c407a6:
  Delete: Docs/Flags/switzerland.txt
BitKeeper/deleted/.del-taiwan.eps~cc2ecaf6122443f:
  Delete: Docs/Flags/taiwan.eps
BitKeeper/deleted/.del-taiwan.gif~b5f1796ed3c458e4:
  Delete: Docs/Flags/taiwan.gif
BitKeeper/deleted/.del-taiwan.pdf~5ff5a019d8237d3c:
  Delete: Docs/Flags/taiwan.pdf
BitKeeper/deleted/.del-taiwan.txt~d0a19c41a1ed3861:
  Delete: Docs/Flags/taiwan.txt
BitKeeper/deleted/.del-mauritius.gif~498d6d0e323d7ef9:
  Delete: Docs/Raw-Flags/mauritius.gif
BitKeeper/deleted/.del-rwanda.gif~ba3a28fb5edc29f5:
  Delete: Docs/Raw-Flags/rwanda.gif
BitKeeper/deleted/.del-sudan.gif~6c5d2540c31b8c27:
  Delete: Docs/Raw-Flags/sudan.gif
BitKeeper/deleted/.del-tanzania.gif~3fbe0bc01bcc3247:
  Delete: Docs/Raw-Flags/tanzania.gif
BitKeeper/deleted/.del-dominica.gif~91c8fddd58385d66:
  Delete: Docs/Raw-Flags/dominica.gif
BitKeeper/deleted/.del-nigeria.gif~f157c385bd632a48:
  Delete: Docs/Raw-Flags/nigeria.gif
BitKeeper/deleted/.del-vietnam.gif~b8a7befce71994b1:
  Delete: Docs/Raw-Flags/vietnam.gif
BitKeeper/deleted/.del-india.gif~c93c8f6fff86f765:
  Delete: Docs/Raw-Flags/india.gif
BitKeeper/deleted/.del-malawi.gif~329ccd19b35bd1e2:
  Delete: Docs/Raw-Flags/malawi.gif
BitKeeper/deleted/.del-kazakhstan.gif~9bbe9c6ac8b42277:
  Delete: Docs/Raw-Flags/kazakhstan.gif
BitKeeper/deleted/.del-trinidad-and-tobago.gif~dfa47192f1bc025:
  Delete: Docs/Raw-Flags/trinidad-and-tobago.gif
BitKeeper/deleted/.del-zimbabwe.gif~478cfbaa6f5b066a:
  Delete: Docs/Raw-Flags/zimbabwe.gif
BitKeeper/deleted/.del-denmark.gif~56d1cc99f435d046:
  Delete: Docs/Raw-Flags/denmark.gif
BitKeeper/deleted/.del-andorra.gif~400c9517f5a7268f:
  Delete: Docs/Raw-Flags/andorra.gif
BitKeeper/deleted/.del-belgium.gif~a94aacc01a1443af:
  Delete: Docs/Raw-Flags/belgium.gif
BitKeeper/deleted/.del-jordan.gif~4381349560430e61:
  Delete: Docs/Raw-Flags/jordan.gif
BitKeeper/deleted/.del-costa-rica.gif~f10605fdf2aea8a:
  Delete: Docs/Raw-Flags/costa-rica.gif
BitKeeper/deleted/.del-france.gif~64aa78ca3e77be37:
  Delete: Docs/Raw-Flags/france.gif
BitKeeper/deleted/.del-gambia.gif~8525f1597465137d:
  Delete: Docs/Raw-Flags/gambia.gif
BitKeeper/deleted/.del-papua-new-guinea.gif~884e9e27b55e51b9:
  Delete: Docs/Raw-Flags/papua-new-guinea.gif
BitKeeper/deleted/.del-yemen.gif~f0d4b9daecbbab9:
  Delete: Docs/Raw-Flags/yemen.gif
BitKeeper/deleted/.del-vanuatu.gif~e66deb3569e8c9a1:
  Delete: Docs/Raw-Flags/vanuatu.gif
BitKeeper/deleted/.del-malaysia.gif~6f7c73227da2ed6:
  Delete: Docs/Raw-Flags/malaysia.gif
BitKeeper/deleted/.del-togo.gif~485e7cec93f5410a:
  Delete: Docs/Raw-Flags/togo.gif
BitKeeper/deleted/.del-benin.gif~e55efbc654304fc2:
  Delete: Docs/Raw-Flags/benin.gif
BitKeeper/deleted/.del-ethiopia.gif~67458ef685bd46ca:
  Delete: Docs/Raw-Flags/ethiopia.gif
BitKeeper/deleted/.del-madagascar.gif~e95bd0c2aabb8ab8:
  Delete: Docs/Raw-Flags/madagascar.gif
BitKeeper/deleted/.del-mauritania.gif~b6d97b5076bb603a:
  Delete: Docs/Raw-Flags/mauritania.gif
BitKeeper/deleted/.del-nepal.gif~ae565b396d09e9db:
  Delete: Docs/Raw-Flags/nepal.gif
BitKeeper/deleted/.del-nicaragua.gif~37b8f7764ac4aea:
  Delete: Docs/Raw-Flags/nicaragua.gif
BitKeeper/deleted/.del-qatar.gif~9fb4afe3352b17:
  Delete: Docs/Raw-Flags/qatar.gif
BitKeeper/deleted/.del-algeria.gif~70038752bd872102:
  Delete: Docs/Raw-Flags/algeria.gif
BitKeeper/deleted/.del-brunei.gif~9d74fa8a8655bb8e:
  Delete: Docs/Raw-Flags/brunei.gif
BitKeeper/deleted/.del-macedonia.gif~bce0e1455919f41b:
  Delete: Docs/Raw-Flags/macedonia.gif
BitKeeper/deleted/.del-marshall.gif~38fc2b1073ceb166:
  Delete: Docs/Raw-Flags/marshall.gif
BitKeeper/deleted/.del-afghanistan.gif~bd934d946f3bdd59:
  Delete: Docs/Raw-Flags/afghanistan.gif
BitKeeper/deleted/.del-saint-lucia.gif~a43f5b43c241e500:
  Delete: Docs/Raw-Flags/saint-lucia.gif
BitKeeper/deleted/.del-somalia.gif~7c09bce9340f39ca:
  Delete: Docs/Raw-Flags/somalia.gif
BitKeeper/deleted/.del-united-arab-emirates.gif~2a6d03565d6ae748:
  Delete: Docs/Raw-Flags/united-arab-emirates.gif
BitKeeper/deleted/.del-bhutan.gif~895593de8b75b3d7:
  Delete: Docs/Raw-Flags/bhutan.gif
BitKeeper/deleted/.del-cyprus.gif~fecfaf77f8153607:
  Delete: Docs/Raw-Flags/cyprus.gif
BitKeeper/deleted/.del-sweden.gif~dc755f14f1dc3c49:
  Delete: Docs/Raw-Flags/sweden.gif
BitKeeper/deleted/.del-turkey.gif~b0bd57ef44dee47a:
  Delete: Docs/Raw-Flags/turkey.gif
BitKeeper/deleted/.del-bangladesh.gif~a26e3ed0f95fe8b:
  Delete: Docs/Raw-Flags/bangladesh.gif
BitKeeper/deleted/.del-guatemala.gif~4d43cb1c1dbeddc7:
  Delete: Docs/Raw-Flags/guatemala.gif
BitKeeper/deleted/.del-tuvalu.gif~3f85331ac0890213:
  Delete: Docs/Raw-Flags/tuvalu.gif
BitKeeper/deleted/.del-denmark-original-incorrect.gif~5d85710fb55de2c2:
  Delete: Docs/Raw-Flags/denmark-original-incorrect.gif
BitKeeper/deleted/.del-ukraine.gif~847cd0f7333e72ac:
  Delete: Docs/Raw-Flags/ukraine.gif
BitKeeper/deleted/.del-antigua-and-barbuda.gif~471679e823427c3d:
  Delete: Docs/Raw-Flags/antigua-and-barbuda.gif
BitKeeper/deleted/.del-mongolia.gif~41633d1ced991c78:
  Delete: Docs/Raw-Flags/mongolia.gif
BitKeeper/deleted/.del-ireland.gif~5e4633333643bee2:
  Delete: Docs/Raw-Flags/ireland.gif
BitKeeper/deleted/.del-niger.gif~c26adaadb8150cee:
  Delete: Docs/Raw-Flags/niger.gif
BitKeeper/deleted/.del-seychelles.gif~f0b489c8e84fef71:
  Delete: Docs/Raw-Flags/seychelles.gif
BitKeeper/deleted/.del-turkmenistan.gif~7679a96df08d950a:
  Delete: Docs/Raw-Flags/turkmenistan.gif
BitKeeper/deleted/.del-indonesia.gif~a096242096a7c7a:
  Delete: Docs/Raw-Flags/indonesia.gif
BitKeeper/deleted/.del-kyrgyzstan.gif~6cbe9f09a93ea9e0:
  Delete: Docs/Raw-Flags/kyrgyzstan.gif
BitKeeper/deleted/.del-sierra-leone.gif~5c446a27d7e98d59:
  Delete: Docs/Raw-Flags/sierra-leone.gif
BitKeeper/deleted/.del-sri-lanka.gif~ef59edd8115e2afa:
  Delete: Docs/Raw-Flags/sri-lanka.gif
BitKeeper/deleted/.del-angola.gif~b366af754ac52de3:
  Delete: Docs/Raw-Flags/angola.gif
BitKeeper/deleted/.del-bulgaria.gif~829eaaa78ea00bc4:
  Delete: Docs/Raw-Flags/bulgaria.gif
BitKeeper/deleted/.del-laos.gif~f686f38cbff73598:
  Delete: Docs/Raw-Flags/laos.gif
BitKeeper/deleted/.del-singapore.gif~e18bf77765b76d2f:
  Delete: Docs/Raw-Flags/singapore.gif
BitKeeper/deleted/.del-bosnia-and-herzegovina.gif~4bfbcc12c26a97ed:
  Delete: Docs/Raw-Flags/bosnia-and-herzegovina.gif
BitKeeper/deleted/.del-italy.gif~c1d1d4c51841d831:
  Delete: Docs/Raw-Flags/italy.gif
BitKeeper/deleted/.del-luxembourg.gif~7e4660faa840e7:
  Delete: Docs/Raw-Flags/luxembourg.gif
BitKeeper/deleted/.del-slovenia.gif~405038776bc7f2a1:
  Delete: Docs/Raw-Flags/slovenia.gif
BitKeeper/deleted/.del-albania.gif~920c18c5f3bd94f5:
  Delete: Docs/Raw-Flags/albania.gif
BitKeeper/deleted/.del-lithuania.gif~88cec9a9fe920632:
  Delete: Docs/Raw-Flags/lithuania.gif
BitKeeper/deleted/.del-usa.gif~7c94951adc03bf9a:
  Delete: Docs/Raw-Flags/usa.gif
BitKeeper/deleted/.del-antartica.gif~1a34b3a7409d5bf2:
  Delete: Docs/Raw-Flags/antartica.gif
BitKeeper/deleted/.del-burkina-faso.gif~f17ab1a7b4726205:
  Delete: Docs/Raw-Flags/burkina-faso.gif
BitKeeper/deleted/.del-tonga.gif~87fef29eef8c57fd:
  Delete: Docs/Raw-Flags/tonga.gif
BitKeeper/deleted/.del-burma.gif~ab554009f470a00b:
  Delete: Docs/Raw-Flags/burma.gif
BitKeeper/deleted/.del-greece.gif~c8fbf8252cc56212:
  Delete: Docs/Raw-Flags/greece.gif
BitKeeper/deleted/.del-kenya.gif~d170c4f48b6635d3:
  Delete: Docs/Raw-Flags/kenya.gif
BitKeeper/deleted/.del-peru.gif~323d2810b25bcab3:
  Delete: Docs/Raw-Flags/peru.gif
BitKeeper/deleted/.del-samoa.gif~7f7fab6fab145abb:
  Delete: Docs/Raw-Flags/samoa.gif
BitKeeper/deleted/.del-honduras.gif~f0715e39e5b80529:
  Delete: Docs/Raw-Flags/honduras.gif
BitKeeper/deleted/.del-philippines.gif~c80b5315738462af:
  Delete: Docs/Raw-Flags/philippines.gif
BitKeeper/deleted/.del-portugal.gif~b6ec9ce2c88220f6:
  Delete: Docs/Raw-Flags/portugal.gif
BitKeeper/deleted/.del-saudi-arabia.gif~af90b0627e4ae9d8:
  Delete: Docs/Raw-Flags/saudi-arabia.gif
BitKeeper/deleted/.del-austria.gif~eda4c0df508b2796:
  Delete: Docs/Raw-Flags/austria.gif
BitKeeper/deleted/.del-canada.gif~e75e7e744dba396c:
  Delete: Docs/Raw-Flags/canada.gif
BitKeeper/deleted/.del-mexico.gif~8effa1ca4d73071e:
  Delete: Docs/Raw-Flags/mexico.gif
BitKeeper/deleted/.del-north-korea.gif~770fd51d9360ae18:
  Delete: Docs/Raw-Flags/north-korea.gif
BitKeeper/deleted/.del-barbados.gif~2c0e969f87b19e31:
  Delete: Docs/Raw-Flags/barbados.gif
BitKeeper/deleted/.del-bolivia.gif~7fbd5d698e19a7:
  Delete: Docs/Raw-Flags/bolivia.gif
BitKeeper/deleted/.del-iceland.gif~aa7253cb1838978e:
  Delete: Docs/Raw-Flags/iceland.gif
BitKeeper/deleted/.del-kuwait.gif~2d03e81edda025d0:
  Delete: Docs/Raw-Flags/kuwait.gif
BitKeeper/deleted/.del-hungary.gif~74e09a15557c20e4:
  Delete: Docs/Raw-Flags/hungary.gif
BitKeeper/deleted/.del-japan.gif~4c6a663ab9a32af2:
  Delete: Docs/Raw-Flags/japan.gif
BitKeeper/deleted/.del-namibia.gif~f3b3b2c233c9031f:
  Delete: Docs/Raw-Flags/namibia.gif
BitKeeper/deleted/.del-cape-verde.gif~152189bcc5c245a2:
  Delete: Docs/Raw-Flags/cape-verde.gif
BitKeeper/deleted/.del-sweden2.gif~51ee64f83a448b5:
  Delete: Docs/Raw-Flags/sweden2.gif
BitKeeper/deleted/.del-latvia.gif~2d1469d626431b5a:
  Delete: Docs/Raw-Flags/latvia.gif
BitKeeper/deleted/.del-russia.gif~403a87b38ae5c91f:
  Delete: Docs/Raw-Flags/russia.gif
BitKeeper/deleted/.del-syria.gif~5a910d0a3a57701:
  Delete: Docs/Raw-Flags/syria.gif
BitKeeper/deleted/.del-colombia.gif~e0eaca8dffd0e137:
  Delete: Docs/Raw-Flags/colombia.gif
BitKeeper/deleted/.del-saint-kitts-and-nevis.gif~485d911ee10ee2da:
  Delete: Docs/Raw-Flags/saint-kitts-and-nevis.gif
BitKeeper/deleted/.del-slovakia.gif~c3d054b17f9c8997:
  Delete: Docs/Raw-Flags/slovakia.gif
BitKeeper/deleted/.del-bahamas.gif~55a7fa36a5710a19:
  Delete: Docs/Raw-Flags/bahamas.gif
BitKeeper/deleted/.del-cambodia.gif~390be7f98e98ef0f:
  Delete: Docs/Raw-Flags/cambodia.gif
BitKeeper/deleted/.del-united-states-of-america.gif~3817309e55e1f332:
  Delete: Docs/Raw-Flags/united-states-of-america.gif
BitKeeper/deleted/.del-azerbaijan.gif~98176e76cf690118:
  Delete: Docs/Raw-Flags/azerbaijan.gif
BitKeeper/deleted/.del-swaziland.gif~88decc065b4034b5:
  Delete: Docs/Raw-Flags/swaziland.gif
BitKeeper/deleted/.del-uganda.gif~45b3e3b539f02aee:
  Delete: Docs/Raw-Flags/uganda.gif
BitKeeper/deleted/.del-armenia.gif~d812f4ac738f93b5:
  Delete: Docs/Raw-Flags/armenia.gif
BitKeeper/deleted/.del-equatorial-guinea.gif~e3d315d4eaf28a41:
  Delete: Docs/Raw-Flags/equatorial-guinea.gif
BitKeeper/deleted/.del-maldives.gif~941bf5a2381b904c:
  Delete: Docs/Raw-Flags/maldives.gif
BitKeeper/deleted/.del-new-zealand.gif~1fbc54ab63225de7:
  Delete: Docs/Raw-Flags/new-zealand.gif
BitKeeper/deleted/.del-haiti.gif~5831a1b51a9b0d3d:
  Delete: Docs/Raw-Flags/haiti.gif
BitKeeper/deleted/.del-solomon-islands.gif~b4de58f666ff31c7:
  Delete: Docs/Raw-Flags/solomon-islands.gif
BitKeeper/deleted/.del-greenland.gif~44310f9e9180e0b:
  Delete: Docs/Raw-Flags/greenland.gif
BitKeeper/deleted/.del-sao-tome-and-principe.gif~94b3095157b80615:
  Delete: Docs/Raw-Flags/sao-tome-and-principe.gif
BitKeeper/deleted/.del-argentina.gif~1818b07e221227:
  Delete: Docs/Raw-Flags/argentina.gif
BitKeeper/deleted/.del-burundi.gif~77e447f736b5b8fe:
  Delete: Docs/Raw-Flags/burundi.gif
BitKeeper/deleted/.del-germany.gif~97dfeb0eb82cac6d:
  Delete: Docs/Raw-Flags/germany.gif
BitKeeper/deleted/.del-kiribati.gif~7f5bc99e8b7a6db:
  Delete: Docs/Raw-Flags/kiribati.gif
BitKeeper/deleted/.del-congo.gif~7737656d9939a718:
  Delete: Docs/Raw-Flags/congo.gif
BitKeeper/deleted/.del-ecuador.gif~da0b80de595301f5:
  Delete: Docs/Raw-Flags/ecuador.gif
BitKeeper/deleted/.del-cuba.gif~16838c96e8195f08:
  Delete: Docs/Raw-Flags/cuba.gif
BitKeeper/deleted/.del-georgia.gif~3a9c93fa982b8c06:
  Delete: Docs/Raw-Flags/georgia.gif
BitKeeper/deleted/.del-oman.gif~3a84654e80950b30:
  Delete: Docs/Raw-Flags/oman.gif
BitKeeper/deleted/.del-bermuda.gif~60ea5c297a759644:
  Delete: Docs/Raw-Flags/bermuda.gif
BitKeeper/deleted/.del-croatia.gif~7b7a7e5c76dbc1:
  Delete: Docs/Raw-Flags/croatia.gif
BitKeeper/deleted/.del-libya.gif~98259878434e0df2:
  Delete: Docs/Raw-Flags/libya.gif
BitKeeper/deleted/.del-pakistan.gif~5ef5cc6b162666b8:
  Delete: Docs/Raw-Flags/pakistan.gif
BitKeeper/deleted/.del-liechtenstein.gif~8d068c686c4c6e8:
  Delete: Docs/Raw-Flags/liechtenstein.gif
BitKeeper/deleted/.del-poland.gif~9d9673f2ea9d5129:
  Delete: Docs/Raw-Flags/poland.gif
BitKeeper/deleted/.del-spain.gif~7217c59c507d153c:
  Delete: Docs/Raw-Flags/spain.gif
BitKeeper/deleted/.del-yugoslavia.gif~532010647f1c98f7:
  Delete: Docs/Raw-Flags/yugoslavia.gif
BitKeeper/deleted/.del-dominican-republic.gif~a05fa19ee59566f:
  Delete: Docs/Raw-Flags/dominican-republic.gif
BitKeeper/deleted/.del-jamaica.gif~48999b84247ad492:
  Delete: Docs/Raw-Flags/jamaica.gif
BitKeeper/deleted/.del-liberia.gif~1dd584598bfe881b:
  Delete: Docs/Raw-Flags/liberia.gif
BitKeeper/deleted/.del-tajikistan.gif~4e42abdd2be16ed8:
  Delete: Docs/Raw-Flags/tajikistan.gif
BitKeeper/deleted/.del-guyana.gif~3eca6d667b6fcb36:
  Delete: Docs/Raw-Flags/guyana.gif
BitKeeper/deleted/.del-netherlands.gif~a1bee178928be339:
  Delete: Docs/Raw-Flags/netherlands.gif
BitKeeper/deleted/.del-south-africa.gif~2aaea35c3bdd90b6:
  Delete: Docs/Raw-Flags/south-africa.gif
BitKeeper/deleted/.del-uzbekistan.gif~ca70f72fc4bca763:
  Delete: Docs/Raw-Flags/uzbekistan.gif
BitKeeper/deleted/.del-bahrein.gif~fb4f1be9efcd652a:
  Delete: Docs/Raw-Flags/bahrein.gif
BitKeeper/deleted/.del-lesotho.gif~c42ad927ffe83db7:
  Delete: Docs/Raw-Flags/lesotho.gif
BitKeeper/deleted/.del-nauru.gif~1e08a1188c8ba0a5:
  Delete: Docs/Raw-Flags/nauru.gif
BitKeeper/deleted/.del-micronesia.gif~c46715026d7efe8e:
  Delete: Docs/Raw-Flags/micronesia.gif
BitKeeper/deleted/.del-suriname.gif~54de84a4ef71a82:
  Delete: Docs/Raw-Flags/suriname.gif
BitKeeper/deleted/.del-moldova.gif~34a9fa58f5674048:
  Delete: Docs/Raw-Flags/moldova.gif
BitKeeper/deleted/.del-egypt.gif~1abbeb9541c45762:
  Delete: Docs/Raw-Flags/egypt.gif
BitKeeper/deleted/.del-romania.gif~325d2f16f9f78167:
  Delete: Docs/Raw-Flags/romania.gif
BitKeeper/deleted/.del-australia.gif~c6d8db20d5bdb80c:
  Delete: Docs/Raw-Flags/australia.gif
BitKeeper/deleted/.del-belize.gif~e1910cdc1a2aaf4a:
  Delete: Docs/Raw-Flags/belize.gif
BitKeeper/deleted/.del-chad.gif~e6657243d593d2be:
  Delete: Docs/Raw-Flags/chad.gif
BitKeeper/deleted/.del-czech-republic.gif~12957b374194bb89:
  Delete: Docs/Raw-Flags/czech-republic.gif
BitKeeper/deleted/.del-south-korea.gif~1311c2eada860e9d:
  Delete: Docs/Raw-Flags/south-korea.gif
BitKeeper/deleted/.del-belarus.gif~e8b45aa5f1ca2b6d:
  Delete: Docs/Raw-Flags/belarus.gif
BitKeeper/deleted/.del-israel.gif~60af491676720a39:
  Delete: Docs/Raw-Flags/israel.gif
BitKeeper/deleted/.del-chile.gif~9e2cb4d54d82d046:
  Delete: Docs/Raw-Flags/chile.gif
BitKeeper/deleted/.del-estonia.gif~95d6213246c5d512:
  Delete: Docs/Raw-Flags/estonia.gif
BitKeeper/deleted/.del-iran.gif~2cb4e9c4657b5b33:
  Delete: Docs/Raw-Flags/iran.gif
BitKeeper/deleted/.del-iraq.gif~a1646e6d65515d76:
  Delete: Docs/Raw-Flags/iraq.gif
BitKeeper/deleted/.del-fiji.gif~3a082d54c888db61:
  Delete: Docs/Raw-Flags/fiji.gif
BitKeeper/deleted/.del-cameroon.gif~e144fca71e8fc244:
  Delete: Docs/Raw-Flags/cameroon.gif
BitKeeper/deleted/.del-lebanon.gif~2d27883e8fe0c647:
  Delete: Docs/Raw-Flags/lebanon.gif
BitKeeper/deleted/.del-botswana.gif~ada926c097ae7484:
  Delete: Docs/Raw-Flags/botswana.gif
BitKeeper/deleted/.del-china.gif~f2aa06d0635b653f:
  Delete: Docs/Raw-Flags/china.gif
BitKeeper/deleted/.del-eritrea.gif~d27f5468ecf168a:
  Delete: Docs/Raw-Flags/eritrea.gif
BitKeeper/deleted/.del-guinea.gif~89df2e995fbc90d1:
  Delete: Docs/Raw-Flags/guinea.gif
BitKeeper/deleted/.del-norway.gif~752c4b4d29375874:
  Delete: Docs/Raw-Flags/norway.gif
BitKeeper/deleted/.del-paraguay.gif~e7b5dd73d7727a1d:
  Delete: Docs/Raw-Flags/paraguay.gif
BitKeeper/deleted/.del-morocco.gif~45858306e12988e9:
  Delete: Docs/Raw-Flags/morocco.gif
BitKeeper/deleted/.del-malta.gif~d0d470d7dbb963ea:
  Delete: Docs/Raw-Flags/malta.gif
BitKeeper/deleted/.del-mozambique.gif~41991b5a9df37691:
  Delete: Docs/Raw-Flags/mozambique.gif
BitKeeper/deleted/.del-guinea-bissau.gif~dc000cb5bd0eb40e:
  Delete: Docs/Raw-Flags/guinea-bissau.gif
BitKeeper/deleted/.del-senegal.gif~944633605d3a29ff:
  Delete: Docs/Raw-Flags/senegal.gif
BitKeeper/deleted/.del-cote-d-ivoire.gif~9adcb3eb5599012e:
  Delete: Docs/Raw-Flags/cote-d-ivoire.gif
BitKeeper/deleted/.del-mali.gif~845a23a66aaaef5:
  Delete: Docs/Raw-Flags/mali.gif
BitKeeper/deleted/.del-finland.gif~3856b7c47a822250:
  Delete: Docs/Raw-Flags/finland.gif
BitKeeper/deleted/.del-grenada.gif~db9d209340558224:
  Delete: Docs/Raw-Flags/grenada.gif
BitKeeper/deleted/.del-zaire.gif~52dbed02848edb31:
  Delete: Docs/Raw-Flags/zaire.gif
BitKeeper/deleted/.del-tunisia.gif~f7b1ad0569613f36:
  Delete: Docs/Raw-Flags/tunisia.gif
BitKeeper/deleted/.del-venezuela.gif~8b00719028184b0d:
  Delete: Docs/Raw-Flags/venezuela.gif
BitKeeper/deleted/.del-comoros.gif~a045ba2590ad8204:
  Delete: Docs/Raw-Flags/comoros.gif
BitKeeper/deleted/.del-zambia.gif~3b2580f7d11759ec:
  Delete: Docs/Raw-Flags/zambia.gif
BitKeeper/deleted/.del-vincent-and-grenadines.gif~f5ab7e413d8f1d5:
  Delete: Docs/Raw-Flags/vincent-and-grenadines.gif
BitKeeper/deleted/.del-great-britain.gif~d4ec21a021252ce5:
  Delete: Docs/Raw-Flags/great-britain.gif
BitKeeper/deleted/.del-panama.gif~99595dd051a094f:
  Delete: Docs/Raw-Flags/panama.gif
BitKeeper/deleted/.del-djibouti.gif~3a11d87bfdc7ca6a:
  Delete: Docs/Raw-Flags/djibouti.gif
BitKeeper/deleted/.del-monaco.gif~d2a99ae34527d133:
  Delete: Docs/Raw-Flags/monaco.gif
BitKeeper/deleted/.del-thailand.gif~263675b09165b835:
  Delete: Docs/Raw-Flags/thailand.gif
BitKeeper/deleted/.del-brazil.gif~1cc3967b6293833b:
  Delete: Docs/Raw-Flags/brazil.gif
BitKeeper/deleted/.del-central-african-republic.gif~c0bf932afe983895:
  Delete: Docs/Raw-Flags/central-african-republic.gif
BitKeeper/deleted/.del-gabon.gif~5e5c7c8dc0902328:
  Delete: Docs/Raw-Flags/gabon.gif
BitKeeper/deleted/.del-ghana.gif~9d71585fa3b223c0:
  Delete: Docs/Raw-Flags/ghana.gif
BitKeeper/deleted/.del-switzerland.gif~37312e2f4537a7e3:
  Delete: Docs/Raw-Flags/switzerland.gif
BitKeeper/deleted/.del-el-salvador.gif~87bfdc4a1b16ca67:
  Delete: Docs/Raw-Flags/el-salvador.gif
BitKeeper/deleted/.del-taiwan.gif~295c56859e5f5e:
  Delete: Docs/Raw-Flags/taiwan.gif
BitKeeper/deleted/.del-uruguay.gif~17d468a8b3affba4:
  Delete: Docs/Raw-Flags/uruguay.gif
Docs/Makefile.am:
   - removed the inclusion of the "Flags" directory in the distribution
   - updated the URL to the manual
scripts/make_win_src_distribution.sh:
   - removed the inclusion of the "Flags" directory (obsolete)
 2004-10-07 18:30:56 +02:00
unknown
59730e28b9 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2004-10-07 18:30:55 +02:00
unknown
264b163e60 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-07 16:30:54 +00:00
unknown
1b991b1a40 ndb_alter_table.result, ndb_alter_table.test: 
...


mysql-test/t/ndb_alter_table.test:
  ...
mysql-test/r/ndb_alter_table.result:
  ...
 2004-10-07 16:30:21 +00:00
unknown
c2d6d2c04b fixed bug where scan is not closed as it should 2004-10-07 16:01:41 +00:00
unknown
23ed93f7fb Protect from use of NULL pointer 
ndb/src/ndbapi/Ndb.cpp:
  Dont call trans->getTransactionId if trans is NULL.
 2004-10-07 17:59:37 +02:00
unknown
4cf6ce7e8b Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb
 2004-10-07 15:42:56 +02:00
unknown
b67205dd43 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-07 13:42:55 +00:00
unknown
ff879b93cf ha_innodb.cc: 
Merge manually the InnoDB mysqldump -l crash patch (crash with LOCK TABLES ... LOCAL) from 4.0 to 4.1; some code cleanup


sql/ha_innodb.cc:
  Merge manually the mysqldump -l crash pacth from 4.0 to 4.1; some code cleanup
 2004-10-07 16:08:15 +03:00
unknown
7949ffc86a InnoDB: tolerate system clock glitches a little better 
in the error monitor thread.  (Bug #5898)


innobase/include/sync0arr.h:
  sync_array_print_long_waits(): return error status
innobase/srv/srv0srv.c:
  srv_error_monitor_thread(): Keep track on successive fatal timeouts,
  and crash the server only if the timeouts have been exceeded for
  several times in succession.
innobase/sync/sync0arr.c:
  sync_array_print_long_waits(): return error status
 2004-10-07 15:58:47 +03:00
unknown
81edee8100 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2004-10-07 14:43:09 +02:00
unknown
57fedc4070 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-07 15:43:08 +03:00
unknown
9757a3a2ec Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-07 12:43:07 +00:00
unknown
9acec233d3 more order by fixes 2004-10-07 12:36:37 +00:00
unknown
72d2e89bc7 Sned original NDB error as warning to client 
sql/ha_ndbcluster.cc:
  Send original NDB error as warning to client so it can be retrieved with SHOW WARNINGS or SHOW ERRORS.
 2004-10-07 14:19:46 +02:00
unknown
d7395d613e correct (high level) fix for BUG#5367 to privent problems in other engines 2004-10-07 14:13:42 +03:00
unknown
3743df6e8e Correct an 'unresolved identifier' problem caused by an "inline" 
function being used before it was defined - "forward" declaration
was insufficient.


innobase/lock/lock0lock.c:
  Compile problem on 'build', solved by moving the definition of
  'lock_rec_get_nth_bit' to the place of the ("forward") declaration.
  It is "inline", and now the body really appears before the first use.
 2004-10-07 12:02:22 +02:00
unknown
77a56a6a9f Initialise "sorted" variable in constructor of QUICK_SELECT. The variable is set to 1 in test_if_skip_sort_order if we decide to optimize "order by" by uinsg index_read. 
mysql-test/r/ndb_index_ordered.result:
  Another test to check the use of "sorted" in combination with reset_bounds()
mysql-test/t/ndb_index_ordered.test:
  Another test to check the use of "sorted" in combination with reset_bounds()
sql/ha_ndbcluster.cc:
  Check that sorted is set to 0 or 1.
sql/opt_range.cc:
  Initialise the sorted variable to zero QUICK_SELECT constructor.
 2004-10-07 11:57:48 +02:00
unknown
a4475441c4 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into neptunus.(none):/home/magnus/mysql/mysql-4.1-ndb


sql/ha_ndbcluster.cc:
  Auto merged
 2004-10-07 11:57:47 +02:00
unknown
d36d5a2957 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-07 09:57:46 +00:00
unknown
9232c91d39 Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 
client/mysqlimport.c:
  Auto merged
myisam/mi_locking.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
 2004-10-07 12:51:32 +03:00
unknown
0129f32bfc Manual merge of tree containing fix for bug #5915 "ALTER TABLE behaves 
differently when converting column to auto_increment in 4.1" with
current tree.


mysql-test/t/type_timestamp.test:
  Auto merged
mysql-test/r/type_timestamp.result:
  Manual merge.
sql/sql_table.cc:
  Manual merge.
 2004-10-07 13:51:32 +04:00
unknown
5b3444d2fa Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-07 12:51:31 +03:00
unknown
1d7ae13349 more order by for ndb 2004-10-07 09:51:30 +00:00
unknown
92c901286e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1


sql/mysqld.cc:
  Auto merged
 2004-10-07 12:37:21 +03:00
unknown
d8a0fbafc1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-07 09:37:20 +00:00
unknown
48923804cb added order by to give same order results on different endian and different sized clusters 2004-10-07 09:27:39 +00:00
unknown
34789efd31 Fix for bug #5915 "ALTER TABLE behaves differently when converting column 
to auto_increment in 4.1".
Now we are enforcing NO_AUTO_VALUE_ON_ZERO mode during ALTER TABLE only
if we are converting one auto_increment column to another auto_increment
column (this also includes most common case when we don't do anything
with such column).

Also now when we convert some column to TIMESTAMP NOT NULL column with
ALTER TABLE we convert NULL values to current timestamp, (as we do this
in INSERT). One can still get old behavior by setting system TIMESTAMP
variable to 0.


mysql-test/r/auto_increment.result:
  Added tests for ALTER TABLE converting columns containing NULL and 0
  values to AUTO_INCREMENT columns.
mysql-test/r/type_timestamp.result:
  Removed test for creation of TIMESTAMP(19) columns (it is 4.0 specific).
  Added test for ALTER TABLE converting columns containing NULL values
  to TIMESTAMP columns.
mysql-test/t/auto_increment.test:
  Added tests for ALTER TABLE converting columns containing NULL and 0
  values to AUTO_INCREMENT columns.
mysql-test/t/type_timestamp.test:
  Removed test for creation of TIMESTAMP(19) columns (it is 4.0 specific).
  Added test for ALTER TABLE converting columns containing NULL values
  to TIMESTAMP columns.
sql/field_conv.cc:
  Fix bug #5915 "ALTER TABLE behaves differently when converting column
  to auto_increment in 4.1". Also now when we are converting some column
  to TIMESTAMP column, we are converting NULL values to CURRENT_TIMESTAMP
  (as it was initially planned).
  
  do_copy_timestamp(): Fixed comment.
  do_copy_next_number(): We should also set auto_increment_field_not_null
    to FALSE if we have NULL in source field.
  Copy_field::set(): Moved setting of copy functions for TIMESTAMP and
    AUTO_INCREMENT fields to proper place (this was dead code before).
sql/sql_table.cc:
  Fix for bug #5915 "ALTER TABLE behaves differently when converting column
  to auto_increment in 4.1".
  
  Instead of always forcing NO_AUTO_VALUE_ON_ZERO in ALTER TABLE it is
  better to do this only if we are converting one auto_increment column
  to another auto_increment column (this also includes most common case
  when we don't do anything with such column).
 2004-10-07 13:02:39 +04:00
unknown
4d52afcb91 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-10-07 01:42:12 -07:00
unknown
1f43673426 adder order by 2004-10-07 08:42:11 +00:00
unknown
96e7be58c8 After merge fixes 
Some bigger code changes was necessary becasue of the multi-table-update and the new HANDLER code


include/hash.h:
  Added back function that's was used in 4.0
mysql-test/r/delete.result:
  Update results after merge
mysql-test/r/flush_table.result:
  Update results after merge
mysql-test/r/func_str.result:
  Update results after merge
mysql-test/r/handler.result:
  Update results after merge
  Change is big becasue in MySQL 4.1 you are not allowed to qualify the handler alias with a databasename
mysql-test/r/multi_update.result:
  More startup cleanups
mysql-test/r/rename.result:
  More startup-cleanups
mysql-test/r/select.result:
  More startup cleanups
mysql-test/r/show_check.result:
  More startup-cleanups
mysql-test/t/ctype_latin1_de.test:
  Cleanup
mysql-test/t/derived.test:
  Portability fix
mysql-test/t/handler.test:
  Update results after merge
  Change is big becasue in MySQL 4.1 you are not allowed to qualify the handler alias with a databasename
mysql-test/t/multi_update.test:
  More startup cleanups
mysql-test/t/range.test:
  More comments
mysql-test/t/rename.test:
  More startup cleanups
mysql-test/t/select.test:
  More startup cleanups
mysql-test/t/show_check.test:
  More startup cleanups
mysql-test/t/type_timestamp.test:
  Add back test deleted during merge
sql/item_cmpfunc.cc:
  After merge fixes
sql/item_func.cc:
  Remove compiler warning
sql/mysql_priv.h:
  After merge fixes
sql/mysqld.cc:
  After merge fixes
sql/sql_acl.cc:
  More debugging
sql/sql_base.cc:
  After merge fixes
  (This fix was needed bacause of multi-table-update reopens tables)
sql/sql_handler.cc:
  After merge fixes
sql/sql_lex.h:
  After merge fixes
sql/sql_select.cc:
  After merge fixes
sql/sql_show.cc:
  After merge fixes
sql/sql_table.cc:
  After merge fixes
  Simple cleanup of mysql_discard_or_import_tablespace
sql/sql_update.cc:
  After merge fixes
  Rework mysql_multi_update to take into account derived tables.
sql/sql_yacc.yy:
  After merge fixes
 2004-10-07 10:50:13 +03:00
unknown
7116e39fe4 Don't show NDB$BLOB tables in SHOW TABLES 
sql/ha_ndbcluster.cc:
  Only add the NDB-table to list of files if it can be discovered AND sucessfully created on disk. This will make susre that NDB$BLOB tables does not show up in SHOW TABLES
 2004-10-07 09:16:46 +02:00
unknown
2906825fac Fix error message 
ndb/src/kernel/vm/Configuration.cpp:
  Correct error message, it should indicate that it was not possible to connect to ndb_mgmd
 2004-10-07 09:09:18 +02:00
unknown
62637c9dca Clean up from Bar and Antony code review. Found an issue with the header file were it could end up corrupted. 
sql/examples/ha_archive.cc:
  Cleanup from Bar's and Antony's code review. Meta file should not be system independent (so you can copy around the files as you like).
sql/examples/ha_archive.h:
  No longer bother with storing the working version of the data files. Its unimportant while there is only one format.
 2004-10-06 23:26:40 -07:00
unknown
1601646a88 Merge build.mysql.com:/home/bk/mysql-4.0 
into build.mysql.com:/users/rburnett/mysql-4.0
 2004-10-06 22:03:20 +02:00
unknown
10cd526ded Enabled the writing of a pid file on Windows. 
mysqld.cc:
  Added call to create_pid_file to start_signal_handler on windows.  Also removed the #ifndef WINDOWS from two calls that deletes the pid file


sql/mysqld.cc:
  Added call to create_pid_file to start_signal_handler on windows.  Also removed the #ifndef WINDOWS from two calls that deletes the pid file
 2004-10-06 21:46:44 +02:00
unknown
bbab9ec678 Merge with 4.0 for 4.1 release 
Noteworthy:
- New HANDLER code
- New multi-update-grant-check code
- Table lock code in ha_innodb.cc was not applied


BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e:
  Auto merged
Build-tools/mysql-copyright-2:
  Auto merged
acinclude.m4:
  Auto merged
client/mysqladmin.c:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
include/myisam.h:
  Auto merged
innobase/btr/btr0btr.c:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
ltmain.sh:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/fsp/fsp0fsp.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/pars/pars0opt.c:
  Auto merged
innobase/row/row0row.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_close.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_locking.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/r/delete.result:
  Auto merged
mysql-test/r/func_if.result:
  Auto merged
Build-tools/mysql-copyright:
  Merge with 4.0 (too most of the code from 4.0)
Makefile.am:
  merge
client/mysql.cc:
  Used 4.1 code
configure.in:
  merge
innobase/os/os0file.c:
  merge
innobase/row/row0mysql.c:
  merge
mysql-test/r/ctype_latin1_de.result:
  merge
mysql-test/r/flush_table.result:
  merge
mysql-test/r/func_str.result:
  merge
mysql-test/r/handler.result:
  merge
mysql-test/r/multi_update.result:
  merge
mysql-test/r/type_timestamp.result:
  Removed testing of 'new' mode, as this is only relevant for 4.0
mysql-test/r/update.result:
  merge
mysql-test/t/delete.test:
  merge
mysql-test/t/flush_table.test:
  merge
mysql-test/t/func_str.test:
  merge
mysql-test/t/handler.test:
  merge
mysql-test/t/multi_update.test:
  merge
mysql-test/t/type_timestamp.test:
  Removed testing of 'new' mode, as this is only relevant for 4.0
mysql-test/t/update.test:
  merge
mysys/errors.c:
  merge
mysys/my_fstream.c:
  merge
mysys/my_pread.c:
  merge
mysys/my_write.c:
  merge
mysys/mysys_priv.h:
  merge
scripts/mysqlhotcopy.sh:
  merge
sql/field.cc:
  Keep code from 4.1
sql/field.h:
  Keep code from 4.1
sql/ha_innodb.cc:
  Don't merge lock code from 4.0; Heikki will look at this
sql/ha_myisam.cc:
  merge
sql/handler.cc:
  merge
sql/item_cmpfunc.cc:
  merge
sql/item_cmpfunc.h:
  merge
sql/item_strfunc.cc:
  merge
sql/mysql_priv.h:
  merge
sql/mysqld.cc:
  merge
sql/protocol.cc:
  merge
sql/records.cc:
  merge
sql/repl_failsafe.cc:
  merge
mysql-test/r/lock_multi.result:
  merge
mysql-test/t/ctype_latin1_de.test:
  merge
mysql-test/t/func_if.test:
  merge
mysql-test/t/lock_multi.test:
  merge
sql/repl_failsafe.h:
  merge
  Remove unnessessary header protection
sql/slave.h:
  merge
sql/sql_acl.cc:
  merge
sql/sql_base.cc:
  merge
sql/sql_cache.cc:
  auto merge
sql/sql_class.cc:
  merge
sql/sql_class.h:
  merge
sql/sql_delete.cc:
  merge
sql/sql_handler.cc:
  Get new HANDLER code into 4.1
sql/sql_parse.cc:
  Keep old file
sql/sql_repl.cc:
  merge
sql/sql_repl.h:
  merge
sql/sql_show.cc:
  merge
sql/sql_table.cc:
  merge
sql/sql_union.cc:
  Applied the examine_rows bug fix from 4.0 by hand
sql/sql_update.cc:
  New multi-update-grant-check code from 4.0
sql/sql_yacc.yy:
  New multi-update-grant-check code from 4.0
sql/stacktrace.c:
  merge
sql/table.h:
  merge
 2004-10-06 19:14:33 +03:00
unknown
fe46310640 Code cleanups while doing review of pushed code 
myisam/mi_locking.c:
  More comments
sql/mysql_priv.h:
  Change mode to uint (as it's a bitmap)
sql/sql_handler.cc:
  Change mode to uint (as it's a bitmap)
  Fixed DBUG_PRINT to use same format as other MySQL code
 2004-10-06 17:20:39 +03:00
unknown
4a618a35c5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb2


BitKeeper/deleted/.del-ndb_subquery.result:
  Delete: mysql-test/r/ndb_subquery.result
BitKeeper/deleted/.del-ndb_subquery.test:
  Delete: mysql-test/t/ndb_subquery.test
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/run-test/atrt-mysql-test-run:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
 2004-10-06 13:34:17 +00:00
unknown
f77811a252 NdbScanOperation.cpp: 
fix for compile error in gcc.3.4.4
  and run error in gcc3.3.2


ndb/src/ndbapi/NdbScanOperation.cpp:
  fix for compile error in gcc.3.4.4
  and run error in gcc3.3.2
 2004-10-06 13:28:59 +00:00
unknown
e82d3d4934 forgot to remove ndbrequire 
ndb/test/run-test/atrt-mysql-test-run:
  ...
 2004-10-06 13:26:38 +00:00
unknown
838af107a3 bug#5736, subqueries and not in 
and testcases


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#5736, subqueries and not in
sql/ha_ndbcluster.cc:
  bug#5736, subqueries and not in
 2004-10-06 13:18:55 +00:00