Commit graph

76 commits

Author SHA1 Message Date
unknown
0892c0f5fe Windows/Visual Studio 2003 fixes for the 5.1.5 release. 2006-01-13 22:09:48 +01:00
unknown
fb0d4c3b41 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


mysql-test/t/symlink.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-12-12 16:12:36 +01:00
unknown
ff410f95f5 make_win_src_distribution.sh:
Removed Visual Studio 6 project files, as they are not maintained


scripts/make_win_src_distribution.sh:
  Removed Visual Studio 6 project files, as they are not maintained
2005-12-11 09:21:13 +01:00
unknown
2361720c98 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1


BUILD/FINISH.sh:
  Auto merged
BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2:
  Auto merged
BitKeeper/deleted/.del-makefilewin~13888739357b3025:
  Auto merged
BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd:
  Auto merged
BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b:
  Auto merged
BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e:
  Auto merged
BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db:
  Auto merged
BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365:
  Auto merged
BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995:
  Auto merged
BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79:
  Auto merged
BitKeeper/deleted/.del-makefilewin~4d139e182457e553:
  Auto merged
BitKeeper/deleted/.del-makefilewin~5104767c73775697:
  Auto merged
BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7:
  Auto merged
BitKeeper/deleted/.del-makefilewin~63acd666293282a:
  Auto merged
BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8:
  Auto merged
BitKeeper/deleted/.del-makefilewin~72a64128bacce71b:
  Auto merged
BitKeeper/deleted/.del-makefilewin~78000390c783b1c5:
  Auto merged
BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5:
  Auto merged
Makefile.am:
  Auto merged
BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0:
  Auto merged
BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5:
  Auto merged
BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac:
  Auto merged
BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95:
  Auto merged
BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d37b6b303348c871:
  Auto merged
BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f:
  Auto merged
BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd:
  Auto merged
BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be:
  Auto merged
BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db:
  Auto merged
BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3:
  Auto merged
BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de:
  Auto merged
BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34:
  Auto merged
BitKeeper/deleted/.del-my_cnf~977f69858affc57b:
  Auto merged
BitKeeper/etc/config:
  Auto merged
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysqltest.c:
  Auto merged
include/Makefile.am:
  Auto merged
include/base64.h:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
mysys/base64.c:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
storage/heap/_check.c:
  Auto merged
storage/heap/hp_create.c:
  Auto merged
storage/innobase/include/Makefile.am:
  Auto merged
storage/innobase/include/rem0rec.h:
  Auto merged
storage/innobase/include/rem0rec.ic:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0upd.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_delete.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/mi_rnext_same.c:
  Auto merged
storage/myisam/mi_search.c:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/myisamchk.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/sort.c:
  Auto merged
storage/myisammrg/myrg_queue.c:
  Auto merged
storage/ndb/config/type_util.mk.am:
  Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/include/transporter/TransporterCallback.hpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp:
  Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp:
  Auto merged
storage/ndb/src/common/transporter/Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/common/util/Makefile.am:
  Auto merged
storage/ndb/src/common/util/Parser.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged
storage/ndb/src/kernel/vm/FastScheduler.cpp:
  Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
  Auto merged
storage/ndb/src/kernel/vm/VMSignal.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOperations.cpp:
  Auto merged
storage/ndb/test/src/HugoCalculator.cpp:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
BUILD/SETUP.sh:
  manual merge
configure.in:
  manual merge
mysql-test/r/alter_table.result:
  manual merge
sql/handler.cc:
  manual merge
sql/mysql_priv.h:
  manual merge
sql/records.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge
  Fix labels
sql/sql_update.cc:
  manual merge
sql/table.cc:
  manual merge
sql/unireg.cc:
  manual merge
storage/ndb/config/type_ndbapi.mk.am:
  manual merge
2005-11-05 01:32:55 +02:00
unknown
1cd63ae36a Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build


scripts/make_win_src_distribution.sh:
  Auto merged
2005-10-11 21:54:23 +02:00
unknown
7d86879442 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


scripts/make_win_src_distribution.sh:
  Auto merged
2005-10-11 21:24:01 +02:00
unknown
28dffbcd66 - added Docs/manual.chm to the windows source distribution (BUG#13899)
scripts/make_win_src_distribution.sh:
  - added Docs/manual.chm to the windows source distribution (BUG#13899). The file
    is placed in there by the Bootstrap script, which pulls it from the mysqldoc
    repository
2005-10-11 21:16:08 +02:00
unknown
b446550e2c Many files:
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver


VC++Files/mysqlserver/dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
VC++Files/bdb/bdb.vcproj:
  New VC7 project files
VC++Files/client/mysql.vcproj:
  New VC7 project files
VC++Files/client/mysqladmin.vcproj:
  New VC7 project files
VC++Files/client/mysqlclient.vcproj:
  New VC7 project files
VC++Files/client/mysqldump.vcproj:
  New VC7 project files
VC++Files/client/mysqlimport.vcproj:
  New VC7 project files
VC++Files/client/mysqlshow.vcproj:
  New VC7 project files
VC++Files/client/mysqltest.vcproj:
  New VC7 project files
VC++Files/comp_err/comp_err.vcproj:
  New VC7 project files
VC++Files/dbug/dbug.vcproj:
  New VC7 project files
VC++Files/heap/heap.vcproj:
  New VC7 project files
VC++Files/innobase/innobase.vcproj:
  New VC7 project files
VC++Files/libmysql/libmysql.vcproj:
  New VC7 project files
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqld/libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqltest/myTest.vcproj:
  New VC7 project files
VC++Files/my_print_defaults/my_print_defaults.vcproj:
  New VC7 project files
VC++Files/myisam/myisam.vcproj:
  New VC7 project files
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
  New VC7 project files
VC++Files/myisamchk/myisamchk.vcproj:
  New VC7 project files
VC++Files/myisamlog/myisamlog.vcproj:
  New VC7 project files
VC++Files/myisammrg/myisammrg.vcproj:
  New VC7 project files
VC++Files/myisampack/myisampack.vcproj:
  New VC7 project files
VC++Files/mysql-test/mysql_test_run_new.vcproj:
  New VC7 project files
VC++Files/mysql.sln:
  New VC7 project files
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  New VC7 project files
VC++Files/mysqlcheck/mysqlcheck.vcproj:
  New VC7 project files
VC++Files/mysqldemb/mysqldemb.vcproj:
  New VC7 project files
VC++Files/mysqlserver/mysqlserver.vcproj:
  New VC7 project files
VC++Files/mysys/mysys.vcproj:
  New VC7 project files
VC++Files/perror/perror.vcproj:
  New VC7 project files
VC++Files/regex/regex.vcproj:
  New VC7 project files
VC++Files/replace/replace.vcproj:
  New VC7 project files
VC++Files/sql/mysqld.vcproj:
  New VC7 project files
VC++Files/strings/strings.vcproj:
  New VC7 project files
VC++Files/test1/test1.vcproj:
  New VC7 project files
VC++Files/tests/mysql_client_test.vcproj:
  New VC7 project files
VC++Files/thr_test/thr_test.vcproj:
  New VC7 project files
VC++Files/vio/vio.vcproj:
  New VC7 project files
VC++Files/zlib/zlib.vcproj:
  New VC7 project files
client/mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
sql/des_key_file.cc:
  Visual C++ wants '"' for local include
scripts/make_win_src_distribution.sh:
  New VC7 project files
2005-09-30 14:03:55 +02:00
unknown
8943090c33 Merge neptunus.(none):/home/msvensson/mysql/bug10713_new/my50-bug10713_new
into  neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new


mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
  Auto merged
VC++Files/mysql.sln:
  Manual merge 5.0 -> 5.1
scripts/make_win_src_distribution.sh:
  Manual merge 5.0 -> 5.1
sql/field.cc:
  Manual merge 5.0 -> 5.1
2005-09-14 09:43:56 +02:00
unknown
9f92c88f43 A few changes to fix compiling on Windows
VC++Files/mysql.sln:
  Added instance manager project
VC++Files/mysys/mysys.vcproj:
  Added mf_unixpath.c
scripts/make_win_src_distribution.sh:
  Updated to include server-tools folder (which includes IM)
server-tools/instance-manager/instance.cc:
  fixed typo
server-tools/instance-manager/mysqlmanager.vcproj:
  fixed up all the filenames in the IM project
2005-09-06 18:06:06 -06:00
unknown
5c0dc1ace8 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1


BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Auto merged
BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc:
  Auto merged
BitKeeper/deleted/.del-Makefile~b293ae88e4394490:
  Auto merged
BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0:
  Auto merged
BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62:
  Auto merged
BitKeeper/etc/config:
  Auto merged
config/ac-macros/ha_ndbcluster.m4:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5:
  Auto merged
mysql-test/r/alter_table.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/innobase/btr/btr0pcur.c:
  Auto merged
storage/innobase/btr/btr0sea.c:
  Auto merged
storage/innobase/include/read0read.h:
  Auto merged
storage/innobase/include/srv0srv.h:
  Auto merged
storage/innobase/include/trx0trx.h:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/read/read0read.c:
  Auto merged
storage/innobase/row/row0ins.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/row/row0umod.c:
  Auto merged
storage/innobase/row/row0upd.c:
  Auto merged
storage/innobase/srv/srv0srv.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/trx/trx0trx.c:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/myrg_static.c:
  Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
  Auto merged
storage/ndb/include/kernel/BlockNumbers.h:
  Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Auto merged
storage/ndb/include/kernel/kernel_types.h:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/include/portlib/NdbTCP.h:
  Auto merged
storage/ndb/src/common/debugger/BlockNames.cpp:
  Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
  Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
  Auto merged
storage/ndb/src/common/portlib/win32/NdbTCP.c:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/Makefile.am:
  Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Manual 5.0 - 5.1 merge
configure.in:
  Manual 5.0 - 5.1 merge
sql/mysql_priv.h:
  Manual 5.0 - 5.1 merge
sql/share/errmsg.txt:
  Manual 5.0 - 5.1 merge
sql/sql_base.cc:
  Manual 5.0 - 5.1 merge
sql/sql_prepare.cc:
  Manual 5.0 - 5.1 merge
storage/ndb/src/common/util/version.c:
  Manual 5.0 - 5.1 merge
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
  Manual 5.0 - 5.1 merge
2005-08-25 13:11:38 -04:00
unknown
15acf421ec Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
2005-08-24 13:56:54 +02:00
unknown
b97c77a024 make_win_src_distribution.sh:
Added missing backslashes


scripts/make_win_src_distribution.sh:
  Added missing backslashes
2005-08-06 03:10:35 +02:00
unknown
2ee0341620 add support for vcproj and sln files (Visual Studio 2003) 2005-08-04 10:08:55 -05:00
unknown
26ba524803 File / directory structure change from 5.0 to 5.1:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".

This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.


VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw:
  mvdir
VC++Files/storage/bdb/build_win32/db_archive.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_buildall.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_checkpoint.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_deadlock.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_dll.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_dump.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_java.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_load.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_printlog.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_recover.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_stat.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_static.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_static1.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_tcl.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_test.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_upgrade.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/db_verify.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_access.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_btrec.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_env.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_lock.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_mpool.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/ex_tpcb.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_access.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_btrec.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_env.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_lock.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_mpool.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp:
  mvdir
VC++Files/storage/bdb/build_win32/libdb.def:
  mvdir
VC++Files/storage/bdb/build_win32/libdb_tcl.def:
  mvdir
VC++Files/mysql.dsw:
  Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
  have been moved into a common subdirectory "storage".
  This must be reflected in the hierarchy of project files.
VC++Files/mysql_ia64.dsw:
  Table handlers "heap", "innobase", "myisam", and "myisammrg"
  have been moved into a common subdirectory "storage".
  This must be reflected in the hierarchy of project files.
VC++Files/sql/mysqld.dsp:
  Table handler "bdb" has been moved into a subdirectory "storage".
  File "myrg_rnext_same.c" belongs to project "myisammrg".
VC++Files/storage/bdb/bdb.dsp:
  Table handler "bdb" has been moved into a subdirectory "storage",
  so the path to the directories keeping the libraries must point one level higher.
VC++Files/storage/heap/heap.dsp:
  Table handler "heap" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/heap/heap_ia64.dsp:
  Table handler "heap" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
scripts/make_win_src_distribution.sh:
  Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb"
  have been moved into a common subdirectory "storage".
  This must be reflected when creating a source package for Windows.
VC++Files/storage/innobase/innobase.dsp:
  Table handler "innobase" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/innobase/innobase_ia64.dsp:
  Table handler "innobase" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam_ia64.dsp:
  Table handler "myisam" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg.dsp:
  Table handler "myisammrg" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg_ia64.dsp:
  Table handler "myisammrg" has been moved into a subdirectory "storage",
  so the pathes to the directories keeping the global includes and libraries must point one level higher.
2005-07-21 21:47:46 +02:00
unknown
eeee5fb10b Merge with 4.1
Makefile.am:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Keep old
client/mysqldump.c:
  Manual merge
client/mysqltest.c:
  Automatic merge
configure.in:
  Manual merge
mysql-test/r/ctype_ucs.result:
  Auto merge
mysql-test/r/func_str.result:
  Auto merge
mysql-test/r/group_by.result:
  Auto merge
mysql-test/r/insert_select.result:
  Auto merge
mysql-test/r/insert_update.result:
  Auto merge
mysql-test/r/lowercase_table2.result:
  Auto merge
mysql-test/r/select.result:
  Manual merge
mysql-test/r/variables.result:
  Auto merge
mysql-test/t/ctype_ucs.test:
  Auto merge
mysql-test/t/func_str.test:
  Auto merge
mysql-test/t/group_by.test:
  Auto merge
mysql-test/t/insert_select.test:
  Auto merge
mysql-test/t/insert_update.test:
  Auto merge
mysql-test/t/ndb_alter_table.test:
  Auto merge
mysql-test/t/select.test:
  Auto merge
mysql-test/t/variables.test:
  Auto merge
mysys/my_access.c:
  Auto merge
scripts/make_win_src_distribution.sh:
  Auto merge
sql/field.cc:
  Manual merge
sql/ha_ndbcluster.cc:
  Auto merge
sql/handler.cc:
  Auto merge
sql/item.cc:
  Auto merge
sql/item.h:
  Manual merge
sql/item_cmpfunc.h:
  Auto merge
sql/item_strfunc.cc:
  Auto merge
sql/item_strfunc.h:
  Auto merge
sql/mysql_priv.h:
  manual merge
sql/mysqld.cc:
  manual merge
sql/opt_range.cc:
  manual merge
sql/set_var.cc:
  Auto merge
sql/sql_base.cc:
  manual merge
  Restore processing of ON DUPLICATE KEY UPDATE
sql/sql_insert.cc:
  manual merge
  Restore processing of ON DUPLICATE KEY UPDATE
  Simplify mysql_prepare_insert by using local variable for select_lex and save old values just before they are changed
sql/sql_parse.cc:
  Restore processing of ON DUPLICATE KEY UPDATE
sql/sql_prepare.cc:
  New ON DUPLICATE KEY UPDATE handling
sql/sql_select.cc:
  manual merge
sql/sql_table.cc:
  auto merge
sql/sql_yacc.yy:
  auto merge
strings/ctype-ucs2.c:
  auto merge
strings/ctype-utf8.c:
  auto merge
2005-07-03 14:17:52 +03:00
unknown
5c42918118 make_win_src_distribution.sh:
Bug#11009, some more cleanup of unneded files from bootstrap


scripts/make_win_src_distribution.sh:
  Bug#11009, some more cleanup of unneded files from bootstrap
2005-06-28 05:25:29 +02:00
unknown
6e1e571b35 make_win_src_distribution.sh:
Add YASSL to Windows source distribution
  Skip .deps, and remove .o files from source dist


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


BitKeeper/deleted/.del-manual.texi~af95f3e233925495:
  Delete: Docs/manual.texi
BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41:
  Delete: Docs/manual_toc.html
BitKeeper/deleted/.del-manual.de.texi~68483e0cb1187601:
  Delete: Docs/manual.de.texi
BitKeeper/deleted/.del-manual.ja.texi~bdf63728a7b03acf:
  Delete: Docs/manual.ja.texi
BitKeeper/deleted/.del-manual-license-spanish.texi~b90a305f6c3755da:
  Delete: Docs/manual-license-spanish.texi
BitKeeper/deleted/.del-section.Infolinks.texi~c237f2f9:
  Delete: Docs/section.Infolinks.texi
BitKeeper/deleted/.del-reservedwords.texi~3d8f82fd477ffdd3:
  Delete: Docs/reservedwords.texi
BitKeeper/deleted/.del-section.Users.texi~41da5f4c:
  Delete: Docs/section.Users.texi
BitKeeper/deleted/.del-section.Testimonials.texi~418f3f63:
  Delete: Docs/section.Testimonials.texi
BitKeeper/deleted/.del-mirrors.texi~391546915de6c399:
  Delete: Docs/mirrors.texi
BitKeeper/deleted/.del-texi2html~74632fe370dcec73:
  Delete: Docs/Support/texi2html
BitKeeper/deleted/.del-texinfo.tex~9c6fd67011bc5409:
  Delete: Docs/Support/texinfo.tex
BitKeeper/deleted/.del-update-reserved-words.pl~e51012acfd971cd6:
  Delete: Docs/Support/update-reserved-words.pl
BitKeeper/deleted/.del-generate-mirror-listing.pl~2fa98b042dd757cf:
  Delete: Docs/Support/generate-mirror-listing.pl
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-denmark.txt~9467854a287a11d3:
  Delete: Docs/Flags/denmark.txt
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-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-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-ukraine.txt~e4c1066096a8b1b3:
  Delete: Docs/Flags/ukraine.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-singapore.gif~78f227e1f0129a:
  Delete: Docs/Flags/singapore.gif
BitKeeper/deleted/.del-italy.eps~4c8a4d9f1e6fe897:
  Delete: Docs/Flags/italy.eps
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.gif~43074800bb72a037:
  Delete: Docs/Flags/italy.gif
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-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-usa.txt~2792ba8db79f0a39:
  Delete: Docs/Flags/usa.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-mexico.eps~9186bd67f1a25a3f:
  Delete: Docs/Flags/mexico.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.gif~a749e257ffeb6588:
  Delete: Docs/Flags/mexico.gif
BitKeeper/deleted/.del-mexico.pdf~a0b20871c2e61325:
  Delete: Docs/Flags/mexico.pdf
BitKeeper/deleted/.del-austria.eps~8e6934b528c7ba65:
  Delete: Docs/Flags/austria.eps
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-mexico.txt~a776cf3478c85e68:
  Delete: Docs/Flags/mexico.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-japan.gif~1c6f45454aa378b3:
  Delete: Docs/Flags/japan.gif
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-hungary.pdf~918baeb6bf07fa97:
  Delete: Docs/Flags/hungary.pdf
BitKeeper/deleted/.del-hungary.txt~c65c28ecc13cee38:
  Delete: Docs/Flags/hungary.txt
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-russia.eps~653c84cd2a80b954:
  Delete: Docs/Flags/russia.eps
BitKeeper/deleted/.del-russia.gif~300890a87b30d01e:
  Delete: Docs/Flags/russia.gif
BitKeeper/deleted/.del-russia.pdf~7fe386a4e48f013:
  Delete: Docs/Flags/russia.pdf
BitKeeper/deleted/.del-latvia.eps~6a6307d66a0cb07:
  Delete: Docs/Flags/latvia.eps
BitKeeper/deleted/.del-russia.txt~91dea186f11d7fdc:
  Delete: Docs/Flags/russia.txt
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-armenia.eps~643f5c261ebab928:
  Delete: Docs/Flags/armenia.eps
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-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-new-zealand.txt~f52fdd9690b63ac0:
  Delete: Docs/Flags/new-zealand.txt
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-germany.eps~8ec02ead1a75bbfb:
  Delete: Docs/Flags/germany.eps
BitKeeper/deleted/.del-germany.gif~7c2750867600a157:
  Delete: Docs/Flags/germany.gif
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-croatia.txt~55d9c2aaec850113:
  Delete: Docs/Flags/croatia.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-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-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-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-romania.txt~c716fe6568110738:
  Delete: Docs/Flags/romania.txt
BitKeeper/deleted/.del-czech-republic.eps~3a16711ce569e4f7:
  Delete: Docs/Flags/czech-republic.eps
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-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-chile.eps~6b4470792773d5f9:
  Delete: Docs/Flags/chile.eps
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-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-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-estonia.pdf~152b980e58ddfe95:
  Delete: Docs/Flags/estonia.pdf
BitKeeper/deleted/.del-estonia.txt~fbabf17caf23c74:
  Delete: Docs/Flags/estonia.txt
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-brazil.eps~d11dc8c39b1b52ed:
  Delete: Docs/Flags/brazil.eps
BitKeeper/deleted/.del-great-britain.txt~c1362455ef389db2:
  Delete: Docs/Flags/great-britain.txt
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-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-rwanda.gif~ba3a28fb5edc29f5:
  Delete: Docs/Raw-Flags/rwanda.gif
BitKeeper/deleted/.del-india.gif~c93c8f6fff86f765:
  Delete: Docs/Raw-Flags/india.gif
BitKeeper/deleted/.del-kazakhstan.gif~9bbe9c6ac8b42277:
  Delete: Docs/Raw-Flags/kazakhstan.gif
BitKeeper/deleted/.del-malawi.gif~329ccd19b35bd1e2:
  Delete: Docs/Raw-Flags/malawi.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-denmark.gif~56d1cc99f435d046:
  Delete: Docs/Raw-Flags/denmark.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-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-malaysia.gif~6f7c73227da2ed6:
  Delete: Docs/Raw-Flags/malaysia.gif
BitKeeper/deleted/.del-vanuatu.gif~e66deb3569e8c9a1:
  Delete: Docs/Raw-Flags/vanuatu.gif
BitKeeper/deleted/.del-ethiopia.gif~67458ef685bd46ca:
  Delete: Docs/Raw-Flags/ethiopia.gif
BitKeeper/deleted/.del-mauritania.gif~b6d97b5076bb603a:
  Delete: Docs/Raw-Flags/mauritania.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-madagascar.gif~e95bd0c2aabb8ab8:
  Delete: Docs/Raw-Flags/madagascar.gif
BitKeeper/deleted/.del-nepal.gif~ae565b396d09e9db:
  Delete: Docs/Raw-Flags/nepal.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-nicaragua.gif~37b8f7764ac4aea:
  Delete: Docs/Raw-Flags/nicaragua.gif
BitKeeper/deleted/.del-afghanistan.gif~bd934d946f3bdd59:
  Delete: Docs/Raw-Flags/afghanistan.gif
BitKeeper/deleted/.del-marshall.gif~38fc2b1073ceb166:
  Delete: Docs/Raw-Flags/marshall.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-cyprus.gif~fecfaf77f8153607:
  Delete: Docs/Raw-Flags/cyprus.gif
BitKeeper/deleted/.del-sweden.gif~dc755f14f1dc3c49:
  Delete: Docs/Raw-Flags/sweden.gif
BitKeeper/deleted/.del-united-arab-emirates.gif~2a6d03565d6ae748:
  Delete: Docs/Raw-Flags/united-arab-emirates.gif
BitKeeper/deleted/.del-turkey.gif~b0bd57ef44dee47a:
  Delete: Docs/Raw-Flags/turkey.gif
BitKeeper/deleted/.del-bhutan.gif~895593de8b75b3d7:
  Delete: Docs/Raw-Flags/bhutan.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-bulgaria.gif~829eaaa78ea00bc4:
  Delete: Docs/Raw-Flags/bulgaria.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-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-peru.gif~323d2810b25bcab3:
  Delete: Docs/Raw-Flags/peru.gif
BitKeeper/deleted/.del-samoa.gif~7f7fab6fab145abb:
  Delete: Docs/Raw-Flags/samoa.gif
BitKeeper/deleted/.del-kenya.gif~d170c4f48b6635d3:
  Delete: Docs/Raw-Flags/kenya.gif
BitKeeper/deleted/.del-saudi-arabia.gif~af90b0627e4ae9d8:
  Delete: Docs/Raw-Flags/saudi-arabia.gif
BitKeeper/deleted/.del-honduras.gif~f0715e39e5b80529:
  Delete: Docs/Raw-Flags/honduras.gif
BitKeeper/deleted/.del-mexico.gif~8effa1ca4d73071e:
  Delete: Docs/Raw-Flags/mexico.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-austria.gif~eda4c0df508b2796:
  Delete: Docs/Raw-Flags/austria.gif
BitKeeper/deleted/.del-bolivia.gif~7fbd5d698e19a7:
  Delete: Docs/Raw-Flags/bolivia.gif
BitKeeper/deleted/.del-canada.gif~e75e7e744dba396c:
  Delete: Docs/Raw-Flags/canada.gif
BitKeeper/deleted/.del-iceland.gif~aa7253cb1838978e:
  Delete: Docs/Raw-Flags/iceland.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-japan.gif~4c6a663ab9a32af2:
  Delete: Docs/Raw-Flags/japan.gif
BitKeeper/deleted/.del-kuwait.gif~2d03e81edda025d0:
  Delete: Docs/Raw-Flags/kuwait.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-hungary.gif~74e09a15557c20e4:
  Delete: Docs/Raw-Flags/hungary.gif
BitKeeper/deleted/.del-russia.gif~403a87b38ae5c91f:
  Delete: Docs/Raw-Flags/russia.gif
BitKeeper/deleted/.del-sweden2.gif~51ee64f83a448b5:
  Delete: Docs/Raw-Flags/sweden2.gif
BitKeeper/deleted/.del-colombia.gif~e0eaca8dffd0e137:
  Delete: Docs/Raw-Flags/colombia.gif
BitKeeper/deleted/.del-latvia.gif~2d1469d626431b5a:
  Delete: Docs/Raw-Flags/latvia.gif
BitKeeper/deleted/.del-saint-kitts-and-nevis.gif~485d911ee10ee2da:
  Delete: Docs/Raw-Flags/saint-kitts-and-nevis.gif
BitKeeper/deleted/.del-syria.gif~5a910d0a3a57701:
  Delete: Docs/Raw-Flags/syria.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-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-united-states-of-america.gif~3817309e55e1f332:
  Delete: Docs/Raw-Flags/united-states-of-america.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-greenland.gif~44310f9e9180e0b:
  Delete: Docs/Raw-Flags/greenland.gif
BitKeeper/deleted/.del-haiti.gif~5831a1b51a9b0d3d:
  Delete: Docs/Raw-Flags/haiti.gif
BitKeeper/deleted/.del-sao-tome-and-principe.gif~94b3095157b80615:
  Delete: Docs/Raw-Flags/sao-tome-and-principe.gif
BitKeeper/deleted/.del-solomon-islands.gif~b4de58f666ff31c7:
  Delete: Docs/Raw-Flags/solomon-islands.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-georgia.gif~3a9c93fa982b8c06:
  Delete: Docs/Raw-Flags/georgia.gif
BitKeeper/deleted/.del-oman.gif~3a84654e80950b30:
  Delete: Docs/Raw-Flags/oman.gif
BitKeeper/deleted/.del-cuba.gif~16838c96e8195f08:
  Delete: Docs/Raw-Flags/cuba.gif
BitKeeper/deleted/.del-bermuda.gif~60ea5c297a759644:
  Delete: Docs/Raw-Flags/bermuda.gif
BitKeeper/deleted/.del-libya.gif~98259878434e0df2:
  Delete: Docs/Raw-Flags/libya.gif
BitKeeper/deleted/.del-croatia.gif~7b7a7e5c76dbc1:
  Delete: Docs/Raw-Flags/croatia.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-uzbekistan.gif~ca70f72fc4bca763:
  Delete: Docs/Raw-Flags/uzbekistan.gif
BitKeeper/deleted/.del-guyana.gif~3eca6d667b6fcb36:
  Delete: Docs/Raw-Flags/guyana.gif
BitKeeper/deleted/.del-nauru.gif~1e08a1188c8ba0a5:
  Delete: Docs/Raw-Flags/nauru.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-bahrein.gif~fb4f1be9efcd652a:
  Delete: Docs/Raw-Flags/bahrein.gif
BitKeeper/deleted/.del-lesotho.gif~c42ad927ffe83db7:
  Delete: Docs/Raw-Flags/lesotho.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-egypt.gif~1abbeb9541c45762:
  Delete: Docs/Raw-Flags/egypt.gif
BitKeeper/deleted/.del-moldova.gif~34a9fa58f5674048:
  Delete: Docs/Raw-Flags/moldova.gif
BitKeeper/deleted/.del-romania.gif~325d2f16f9f78167:
  Delete: Docs/Raw-Flags/romania.gif
BitKeeper/deleted/.del-belize.gif~e1910cdc1a2aaf4a:
  Delete: Docs/Raw-Flags/belize.gif
BitKeeper/deleted/.del-australia.gif~c6d8db20d5bdb80c:
  Delete: Docs/Raw-Flags/australia.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-fiji.gif~3a082d54c888db61:
  Delete: Docs/Raw-Flags/fiji.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-lebanon.gif~2d27883e8fe0c647:
  Delete: Docs/Raw-Flags/lebanon.gif
BitKeeper/deleted/.del-botswana.gif~ada926c097ae7484:
  Delete: Docs/Raw-Flags/botswana.gif
BitKeeper/deleted/.del-cameroon.gif~e144fca71e8fc244:
  Delete: Docs/Raw-Flags/cameroon.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-morocco.gif~45858306e12988e9:
  Delete: Docs/Raw-Flags/morocco.gif
BitKeeper/deleted/.del-mozambique.gif~41991b5a9df37691:
  Delete: Docs/Raw-Flags/mozambique.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-cote-d-ivoire.gif~9adcb3eb5599012e:
  Delete: Docs/Raw-Flags/cote-d-ivoire.gif
BitKeeper/deleted/.del-guinea-bissau.gif~dc000cb5bd0eb40e:
  Delete: Docs/Raw-Flags/guinea-bissau.gif
BitKeeper/deleted/.del-malta.gif~d0d470d7dbb963ea:
  Delete: Docs/Raw-Flags/malta.gif
BitKeeper/deleted/.del-senegal.gif~944633605d3a29ff:
  Delete: Docs/Raw-Flags/senegal.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-mali.gif~845a23a66aaaef5:
  Delete: Docs/Raw-Flags/mali.gif
BitKeeper/deleted/.del-zaire.gif~52dbed02848edb31:
  Delete: Docs/Raw-Flags/zaire.gif
BitKeeper/deleted/.del-venezuela.gif~8b00719028184b0d:
  Delete: Docs/Raw-Flags/venezuela.gif
BitKeeper/deleted/.del-tunisia.gif~f7b1ad0569613f36:
  Delete: Docs/Raw-Flags/tunisia.gif
BitKeeper/deleted/.del-comoros.gif~a045ba2590ad8204:
  Delete: Docs/Raw-Flags/comoros.gif
BitKeeper/deleted/.del-panama.gif~99595dd051a094f:
  Delete: Docs/Raw-Flags/panama.gif
BitKeeper/deleted/.del-vincent-and-grenadines.gif~f5ab7e413d8f1d5:
  Delete: Docs/Raw-Flags/vincent-and-grenadines.gif
BitKeeper/deleted/.del-zambia.gif~3b2580f7d11759ec:
  Delete: Docs/Raw-Flags/zambia.gif
BitKeeper/deleted/.del-djibouti.gif~3a11d87bfdc7ca6a:
  Delete: Docs/Raw-Flags/djibouti.gif
BitKeeper/deleted/.del-great-britain.gif~d4ec21a021252ce5:
  Delete: Docs/Raw-Flags/great-britain.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-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-central-african-republic.gif~c0bf932afe983895:
  Delete: Docs/Raw-Flags/central-african-republic.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
BitKeeper/deleted/.del-empty.png~5017ba255c3d3833:
  Delete: Docs/Images/empty.png
BitKeeper/deleted/.del-Makefile.am~8eda4336dfcaefc:
  Delete: Docs/Images/Makefile.am
BitKeeper/deleted/.del-flag-background.pnm~77e3c9cb7b9213c5:
  Delete: Docs/Images/flag-background.pnm
BitKeeper/deleted/.del-mysql-logo.gif~940b52eefc6abf85:
  Delete: Docs/Images/mysql-logo.gif
BitKeeper/deleted/.del-MySQL-for-dummies~f6a19f3b67efa4c2:
  Delete: Docs/To-be-included-in-the-manual/MySQL-for-dummies
BitKeeper/deleted/.del-myodbc-br.texi~cea931066c24b744:
  Delete: Docs/Translations/myodbc-br.texi
BitKeeper/deleted/.del-mysql-compatible.jpg~6e867955c3605510:
  Delete: Docs/Images/Attic/mysql-compatible.jpg
BitKeeper/deleted/.del-mysql5.gif~af79b5f7dd8ddd44:
  Delete: Docs/Images/Attic/mysql5.gif
BitKeeper/deleted/.del-mysql_anim-01.gif~9fce1e01aba4866a:
  Delete: Docs/Images/Attic/mysql_anim-01.gif
BitKeeper/deleted/.del-mysql_anim-02.gif~df8efb861614f32:
  Delete: Docs/Images/Attic/mysql_anim-02.gif
BitKeeper/deleted/.del-mysql_anim-03.gif~ce64bb66129a474c:
  Delete: Docs/Images/Attic/mysql_anim-03.gif
BitKeeper/deleted/.del-mysql_anim-04.gif~afc01932a9c3f83b:
  Delete: Docs/Images/Attic/mysql_anim-04.gif
BitKeeper/deleted/.del-mysql_anim-05.gif~f188d38557a8e8a:
  Delete: Docs/Images/Attic/mysql_anim-05.gif
BitKeeper/deleted/.del-mysql_anim-06.gif~f59ee5dbe9c945b8:
  Delete: Docs/Images/Attic/mysql_anim-06.gif
BitKeeper/deleted/.del-mysql-01.gif~c8ed2860e4f9e92e:
  Delete: Docs/Images/Attic/mysql-01.gif
BitKeeper/deleted/.del-powered-by-MySQL-transparent.gif~ea566879e8ea5f02:
  Delete: Docs/Images/Attic/powered-by-MySQL-transparent.gif
BitKeeper/deleted/.del-mysql-02.gif~17509c4ab36c7561:
  Delete: Docs/Images/Attic/mysql-02.gif
BitKeeper/deleted/.del-mysql-03.gif~cedb88c446a395b5:
  Delete: Docs/Images/Attic/mysql-03.gif
BitKeeper/deleted/.del-mysql-04.gif~3695675c16a75042:
  Delete: Docs/Images/Attic/mysql-04.gif
BitKeeper/deleted/.del-mysql-05.gif~a45f115f526a6438:
  Delete: Docs/Images/Attic/mysql-05.gif
BitKeeper/deleted/.del-mysql-06.gif~66f9a53d8df1e165:
  Delete: Docs/Images/Attic/mysql-06.gif
BitKeeper/deleted/.del-mysql-07.gif~a18aa4f41b706752:
  Delete: Docs/Images/Attic/mysql-07.gif
BitKeeper/deleted/.del-mysql-08.gif~174e5e218068b41a:
  Delete: Docs/Images/Attic/mysql-08.gif
BitKeeper/deleted/.del-mysql-09.gif~fcb0f421a0402990:
  Delete: Docs/Images/Attic/mysql-09.gif
BitKeeper/deleted/.del-mysql-10.gif~6de012714bb03c8c:
  Delete: Docs/Images/Attic/mysql-10.gif
BitKeeper/deleted/.del-mysql-11.gif~302b17f6433e4621:
  Delete: Docs/Images/Attic/mysql-11.gif
BitKeeper/deleted/.del-mysql-12.gif~c663ff60fd3190d9:
  Delete: Docs/Images/Attic/mysql-12.gif
BitKeeper/deleted/.del-mysql-13.gif~d1dabc02fd840107:
  Delete: Docs/Images/Attic/mysql-13.gif
BitKeeper/deleted/.del-mysql-14.gif~c96ad71d33d46af:
  Delete: Docs/Images/Attic/mysql-14.gif
BitKeeper/deleted/.del-mysql-15.gif~e94b536482b5cfa8:
  Delete: Docs/Images/Attic/mysql-15.gif
BitKeeper/deleted/.del-mysql-16.gif~1c82d75dbe265ad0:
  Delete: Docs/Images/Attic/mysql-16.gif
BitKeeper/deleted/.del-html-fs.gif~340ae5ab17ccc178:
  Delete: Docs/Images/Attic/html-fs.gif
BitKeeper/deleted/.del-mysql-17.gif~279e92aeb167d638:
  Delete: Docs/Images/Attic/mysql-17.gif
BitKeeper/deleted/.del-mysql-18.gif~92e9fa428b0ef9f4:
  Delete: Docs/Images/Attic/mysql-18.gif
BitKeeper/deleted/.del-mysql-19.gif~9be698e1b3cdb933:
  Delete: Docs/Images/Attic/mysql-19.gif
BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d:
  Delete: Docs/mysqld_error.txt
Docs/Makefile.am:
  - removed all targets that depended on manual.texi as the input file
    (in preparation for the switch to DocBook XML)
  - removed some other unused cruft no longer required or maintained elsewhere by now
  - don't create COPYING out of the mysql.info file (it's now part of the source tree)
configure.in:
  - removed references to the Docs/Images subdirectory that has been removed
scripts/make_win_src_distribution.sh:
  - Disabled adding the manual to the windows source distribution (manual.texi is gone, and so are the
    HTML and TXT targets)
  - removed Docs/Flags (obsolete) from the Windows source distribution
support-files/mysql.spec.sh:
  - removed the MySQL manual files (html/ps/texi) from the MySQL-server RPM
2005-04-13 11:51:38 +02:00
unknown
cb1bdf4d84 Merge
mysql-test/r/group_by.result:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge
sql/item_cmpfunc.cc:
  merge
support-files/mysql.server.sh:
  merge
2005-04-01 10:13:37 +02:00
unknown
2547464488 include sql/examples in the window source distribution 2005-03-31 20:27:29 +02:00
unknown
4743f7eb27 Merge
Build-tools/Do-compile:
  SCCS merged
mysql-test/mysql-test-run.sh:
  SCCS merged
scripts/make_win_src_distribution.sh:
  SCCS merged
2005-03-11 11:21:51 +01:00
unknown
33f9d926f4 Correct "make_win_src_distribution" to not introduce additional directory layers,
adapt the Windows build files accordingly.


VC++Files/tests/mysql_client_test.dsp:
  As the directory structure on Windows now resembles that on Unix (no more
  "tests/tests", by the correction in "make_win_src_distribution.sh"), the location
  of "mysql_client_test.*" has changed. Adapt the build tools accordingly.
VC++Files/tests/mysql_client_test_ia64.dsp:
  As the directory structure on Windows now resembles that on Unix (no more
  "tests/tests", by the correction in "make_win_src_distribution.sh"), the location
  of "mysql_client_test.*" has changed. Adapt the build tools accordingly.
scripts/make_win_src_distribution.sh:
  1) The semantics of "cp -R src targ" depend on the (non)existence of "targ".
  By simply doing "$CP -R $i $BASE/$i", the directory hierarchy below $BASE differed
  from the source for each "$i" that already existed as a target directory.
  This is now prevented by checking the existence and adapting the command.
  
  2) Comment where "$BASE" (the target directory) comes into existence.
  
  3) Introduce an "abort" function as a start point for more sanity checks, use it.
2005-03-10 21:13:46 +01:00
unknown
48577bb59f merged
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/page0page.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2005-03-09 14:09:06 +01:00
unknown
f2cfb6ef3b mysql-test-run.pl:
Removed -c from /bin/sh call
make_win_src_distribution.sh:
  Copy all content in mysql-test
make_win_binary_distribution.sh, make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
s_win32_dsp, s_win32, s_vxworks, s_test, s_readme, s_java, s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris


bdb/dist/s_javah:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_java:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_readme:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_test:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_vxworks:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
bdb/dist/s_win32_dsp:
  Bug #6209 changes for building Berkeley DB from BitKeeper on Solaris
scripts/make_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
scripts/make_win_binary_distribution.sh:
  Add Perl version of mysql-test-run to package
scripts/make_win_src_distribution.sh:
  Copy all content in mysql-test
mysql-test/mysql-test-run.pl:
  Removed -c from /bin/sh call
2005-03-09 01:34:22 +01:00
unknown
3a4372d310 make_win_src_distribution.sh, make_binary_distribution.sh, mysql-test-run.sh:
Removed references to ISAM and MERGE


mysql-test/mysql-test-run.sh:
  Removed references to ISAM and MERGE
scripts/make_binary_distribution.sh:
  Removed references to ISAM and MERGE
scripts/make_win_src_distribution.sh:
  Removed references to ISAM and MERGE
2005-01-01 21:13:09 +01:00
unknown
bb2d3eaa30 Merge with 4.1
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_base.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/include/dict0dict.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/metadata.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/insert_update.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/r/type_enum.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/system_mysql_db_fix.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/util/version.c:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/Makefile.am:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
ndb/test/ndbapi/Makefile.am:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_geofunc.cc:
  Auto merged
sql/item_row.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/password.c:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_do.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/strfunc.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/tztime.h:
  Auto merged
sql/udf_example.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
Makefile.am:
  Simple merge
client/mysqldump.c:
  Simple merge
configure.in:
  Simple merge
libmysqld/lib_sql.cc:
  Automatic merge
mysql-test/r/func_str.result:
  Automatic merge
mysql-test/r/grant.result:
  simple merge
mysql-test/r/multi_update.result:
  automatc merge
mysql-test/r/ps.result:
  automatic merge
mysql-test/r/ps_2myisam.result:
  Automatic merge
mysql-test/r/ps_3innodb.result:
  Automatic merge
mysql-test/r/ps_4heap.result:
  Automatic merge
mysql-test/r/ps_5merge.result:
  Automatic merge
mysql-test/r/ps_6bdb.result:
  Automatic merge
mysql-test/r/ps_7ndb.result:
  Automatic merge
mysql-test/r/show_check.result:
  Automatic merge
mysql-test/r/subselect.result:
  Automatic merge
mysql-test/t/grant.test:
  Automatic merge
mysql-test/t/multi_update.test:
  Automatic merge
mysql-test/t/ps.test:
  Automatic merge
mysql-test/t/show_check.test:
  Automatic merge
ndb/docs/wl2077.txt:
  merge
ndb/src/mgmsrv/main.cpp:
  merge
scripts/mysql_fix_privilege_tables.sh:
  merge
sql/item.cc:
  Merge (difficult)
sql/item.h:
  simple merge
sql/item_cmpfunc.h:
  Automatic merge
sql/item_subselect.cc:
  Simple merge
sql/item_subselect.h:
  Automatic merge
sql/mysql_priv.h:
  Simple merge
sql/slave.h:
  Automatic merge
sql/sql_base.cc:
  Removed code that was backported to 4.1
sql/sql_class.h:
  Merge (some code moved to sql_insert.cc)
sql/sql_db.cc:
  simple merge
sql/sql_insert.cc:
  Merge (difficult as logic had changed both in 4.1 and 5.0)
  Some coded moved here from sql_class.h
sql/sql_parse.cc:
  Merge (difficult)
sql/sql_prepare.cc:
  Simple merge
sql/sql_select.cc:
  Automatic merge
sql/sql_table.cc:
  Simple merge
sql/sql_update.cc:
  Difficult merge because of different logic for multi-updates
sql/sql_yacc.yy:
  Simple merge
tests/client_test.c:
  Simple merge
2004-12-22 13:54:39 +02:00
unknown
72c28731e9 merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
ndb/include/Makefile.am:
  Auto merged
ndb/include/kernel/LogLevel.hpp:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/include/ndbapi/NdbConnection.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
ndb/src/common/logger/FileLogHandler.cpp:
  Auto merged
ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/src/mgmsrv/Services.hpp:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged
2004-12-17 10:36:14 +01:00
unknown
820d68d903 corrected mysqltest.dsp
corrected mysql_test_run_new.dsp
added dependency
corrected path of mysql_test_run_new.dsp
fixed wrong code
added my_create_tables.c
removed command_line
fixed #elif
restored NAME_MAX and MAX_FNAME
added create_system_files()
added compare() for windows
added all files of testes in script
added mysql-test in script


BitKeeper/etc/ignore:
  Added mysql-4.1.8-win-src.zip to the ignore list
VC++Files/client/mysqltest.dsp:
  corrected dsp file
VC++Files/mysql-test/mysql_test_run_new.dsp:
  corrected mysql_test_run_new.dsp
VC++Files/mysql.dsw:
  added dependency
  corrected path of mysql_test_run_new.dsp
client/mysqltest.c:
  fixed wrong code
mysql-test/Makefile.am:
  added my_create_tables.c
mysql-test/my_manage.c:
  removed command_line
  fixed #elif
mysql-test/my_manage.h:
  restored NAME_MAX and MAX_FNAME
mysql-test/mysql_test_run_new.c:
  added create_system_files()
  added compare for windows
scripts/make_win_src_distribution.sh:
  added all files of testes
  added mysql-test
2004-12-14 18:46:55 +05:00
unknown
0a09408da2 Added pathes to mysqld_error.h and sql_state.h; fixed segfault bug;
BitKeeper/etc/ignore:
  added extra/created_include_files
extra/Makefile.am:
  Make sure that mysqld_error.h and sql_state.h are not build in the same time.
extra/comp_err.c:
  Fixed segfault bug
libmysqld/Makefile.am:
  Added path to mysqld_error.h and sql_state.h
libmysqld/examples/Makefile.am:
  Added path to mysqld_error.h and sql_state.h
scripts/make_win_src_distribution.sh:
  Windows version fix
2004-12-14 01:54:16 +02:00
unknown
63b4095284 wl1744 - nbd windoze port
ndb/include/logger/SysLogHandler.hpp:
  win-port
ndb/include/ndb_global.h:
  win-port
ndb/include/portlib/PortDefs.h:
  win-port
ndb/src/common/mgmcommon/NdbConfig.c:
  win-port
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  win-port
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  win-port
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  win-port
ndb/src/kernel/main.cpp:
  win-port
ndb/src/kernel/vm/Configuration.cpp:
  win-port
ndb/src/kernel/vm/Emulator.cpp:
  win-port
ndb/src/mgmsrv/CommandInterpreter.cpp:
  win-port
ndb/src/mgmsrv/main.cpp:
  win-port
scripts/make_win_src_distribution.sh:
  win-port
2004-11-10 14:18:49 +01:00
unknown
f0614a9fec wl1744 - ndb on windows
Add rules for creating dsp-files
2004-11-10 00:03:01 +01:00
unknown
616b7460aa Fix for bug#5385 ("Text files have unix line break"):
Windows style line end \r\n on README, license, and similar essential plaintext files.


scripts/make_win_src_distribution.sh:
  Some plain text files (which a Windows user might view in any editor) should have 
  Windows style line end \r\n (bug#5385). The tool is changed to do a systematic pass 
  over all files, find all relevant ones (especially "README*", "ChangeLog", "INSTALL*", 
  license text), and adapt them.
  Included are two minor cleanups ("useless use of cat" avoided, variable setting 
  moved to more sensible place).
2004-10-27 21:59:34 +02: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
b91838fcfd - Rename the *.cnf files to *.ini for the Windows source distribution 2004-10-05 14:42:15 +02:00
unknown
945625ebaa manually merged
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0dbg.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/conf_to_src.c:
  Auto merged
libmysql/dll.c:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_uint.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
2004-08-18 19:57:55 +02:00
unknown
06cd2efc2e - rename: EXCEPTIONS->EXCEPTIONS-CLIENT 2004-08-05 17:05:11 +02:00
unknown
dc82282e9e - More changes to include the FLOSS License Exception in the
various distributions


Docs/Makefile.am:
   - Honoured node name change in manual.texi FOSS->FLOSS
Makefile.am:
   - actually add EXCEPTIONS to the source distribution
scripts/make_win_src_distribution.sh:
   - add EXCEPTIONS to the Windows source distribution, too
2004-08-05 11:22:02 +02:00
unknown
3eb5fd0f24 Fix to be able to cross-compile for modesto
scripts/make_win_src_distribution.sh:
  Change mode to -rw-rw-r--
2004-06-27 18:20:06 +03:00
unknown
02b3d6f1cb Cleanup for creating windows source distribution
BitKeeper/etc/ignore:
  added sql/mysql_tzinfo_to_sql.cc
scripts/make_win_src_distribution.sh:
  Don't copy InstallShield files if we are in a normal bk tree
scripts/mysql_create_system_tables.sh:
  Remove duplicate entry
2004-06-26 10:57:00 +03:00
unknown
41ffbaf1af make_win_src_distribution.sh:
4.1 tree must use installshield project files due to new tables


scripts/make_win_src_distribution.sh:
  4.1 tree must use installshield project files due to new tables
2004-06-25 19:25:36 -07:00
unknown
c6e23c8549 Merge with 4.0 to get the latest bug patches to 4.1
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
2004-06-25 20:13:05 +03:00
unknown
72093a6d14 Add missing .cnf files to windows installation (Bug #4216)
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
2004-06-25 18:54:43 +03:00
unknown
4e664e3e43 Added missing root user to mysql.user on windows. (Bug #4242)
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()
2004-06-25 18:49:36 +03:00
unknown
b09974a1a0 Remove some code from sql_yacc.cc that doesn't do anything except produce warnings on VC++
mysql-test/t/fulltext.test:
  After merge fix
2004-05-28 00:03:19 +03:00
unknown
1d9fbbe3ce Merge with 4.0, mainly to get changes to windows project files
VC++Files/client/mysqladmin.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/dbug/dbug.dsp:
  Auto merged
VC++Files/heap/heap.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/isam/isam.dsp:
  Auto merged
VC++Files/isamchk/isamchk.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
BitKeeper/deleted/.del-sync0ipm.ic~2024167f6418de39:
  Auto merged
VC++Files/libmysqltest/myTest.dsp:
  Auto merged
VC++Files/merge/merge.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisam/myisam.dsp:
  Auto merged
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  Auto merged
VC++Files/myisammrg/myisammrg.dsp:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Auto merged
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/pack_isam/pack_isam.dsp:
  Auto merged
VC++Files/perror/perror.dsp:
  Auto merged
VC++Files/regex/regex.dsp:
  Auto merged
VC++Files/replace/replace.dsp:
  Auto merged
VC++Files/test1/test1.dsp:
  Auto merged
VC++Files/thr_test/thr_test.dsp:
  Auto merged
VC++Files/vio/vio.dsp:
  Auto merged
VC++Files/zlib/zlib.dsp:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
include/m_string.h:
  Auto merged
include/mysql_embed.h:
  Auto merged
include/mysql_version.h.in:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/mem/mem0pool.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
VC++Files/bdb/bdb.dsp:
  Merge with 4.0
VC++Files/client/mysql.dsp:
  Merge with 4.0
VC++Files/client/mysqlclient.dsp:
  Merge with 4.0
VC++Files/comp_err/comp_err.dsp:
  Merge with 4.0
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Merge with 4.0
VC++Files/libmysqld/libmysqld.dsp:
  Merge with 4.0
VC++Files/myisamchk/myisamchk.dsp:
  Merge with 4.0
VC++Files/myisamlog/myisamlog.dsp:
  Merge with 4.0
VC++Files/myisampack/myisampack.dsp:
  Merge with 4.0
VC++Files/mysqldemb/mysqldemb.dsp:
  Merge with 4.0
VC++Files/mysqlserver/mysqlserver.dsp:
  Merge with 4.0
VC++Files/sql/mysqld.dsp:
  Merge with 4.0
VC++Files/strings/strings.dsp:
  Merge with 4.0
libmysqld/lib_sql.cc:
  Merge with 4.0
libmysqld/libmysqld.def:
  Merge with 4.0
mysql-test/r/func_str.result:
  Merge with 4.0
mysql-test/r/handler.result:
  auto
mysql-test/r/variables.result:
  Merge with 4.0
mysql-test/t/func_str.test:
  auto
mysql-test/t/handler.test:
  auto
mysql-test/t/variables.test:
  Merge with 4.0
scripts/make_win_src_distribution.sh:
  auto
scripts/mysql_install_db.sh:
  Use original file
sql/Makefile.am:
  Merge with 4.0
sql/ha_innodb.cc:
  auto
sql/item_strfunc.cc:
  Merge with 4.0
sql/mysql_priv.h:
  auto
sql/mysqld.cc:
  Merge with 4.0
sql/set_var.cc:
  Merge with 4.0
sql/slave.cc:
  auto
sql/sql_class.h:
  auto
sql/sql_handler.cc:
  Merge with 4.0
strings/ctype-tis620.c:
  Merge with 4.0
2004-05-20 00:54:52 +03:00
unknown
2d67f1e0cf Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
Ensured that all projects compile
Removed compiler warnings
Better setting of server_version variable.
Fix that make_win_src_distribution creates the privilege tables.


VC++Files/bdb/bdb.dsp:
  Small, automatic changes
VC++Files/client/mysql.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqladmin.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlclient.dsp:
  Removed files that should only be used with mysql command line client
VC++Files/client/mysqldump.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlimport.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/client/mysqlshow.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/comp_err/comp_err.dsp:
  Automatic changes
VC++Files/dbug/dbug.dsp:
  Automatic changes
VC++Files/heap/heap.dsp:
  automatic changes
VC++Files/innobase/innobase.dsp:
  Automatic changes
VC++Files/isam/isam.dsp:
  Automatic changes
VC++Files/isamchk/isamchk.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysql/libmysql.dsp:
  Automatic changes
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Add missing files
VC++Files/libmysqld/libmysqld.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/libmysqltest/myTest.dsp:
  Automatic changes
VC++Files/merge/merge.dsp:
  Automatic changes
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisam/myisam.dsp:
  automatic changes
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  automatic changes
VC++Files/myisamchk/myisamchk.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisamlog/myisamlog.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisammrg/myisammrg.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/myisampack/myisampack.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysql.dsw:
  Automatic changes
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqldemb/mysqldemb.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/mysqlserver/mysqlserver.dsp:
  Automatic changes
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Automatic changes
VC++Files/mysqlwatch/mysqlwatch.dsp:
  Automatic changes
VC++Files/mysys/mysys.dsp:
  Automatic changes
VC++Files/pack_isam/pack_isam.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/perror/perror.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/regex/regex.dsp:
  Automatic changes
VC++Files/replace/replace.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/sql/mysqld.dsp:
  Added support for projects 'classic', 'classic nt', 'pro' and 'pro nt'
VC++Files/strings/strings.dsp:
  Removed duplicate code for strnlen
VC++Files/test1/test1.dsp:
  Automatic changes
VC++Files/thr_test/thr_test.dsp:
  Automatic changes
VC++Files/vio/vio.dsp:
  Automatic changes
VC++Files/zlib/contrib/asm386/zlibvc.dsp:
  Automatic changes
VC++Files/zlib/zlib.dsp:
  Automatic changes
extra/my_print_defaults.c:
  Fixed bug in --verbose
include/m_string.h:
  Portability fix
include/mysql_embed.h:
  Better setting of server_version variable
include/mysql_version.h.in:
  Better license text handling
innobase/pars/pars0lex.l:
  Remove compiler warnings
innobase/trx/trx0sys.c:
  Remove compiler warnings
libmysqld/lib_sql.cc:
  Better setting of server_version variable
libmysqld/libmysqld.def:
  Add functions needed for mysql command line client
myisam/myisam_ftdump.c:
  Remove compiler warnings
mysys/sha1.c:
  Remove compiler warnings
scripts/make_win_src_distribution.sh:
  Safety fix
scripts/mysql_install_db.sh:
  Backport from 4.1 to allow make_win_src_distribution create the privilege tables
sql/Makefile.am:
  Add new file mysqld_suffix.h
  Remove not used file sql_olap.h
sql/ha_innodb.cc:
  Remove not used variable
sql/mysqld.cc:
  Better setting of server_version variable
sql/set_var.cc:
  Fixed bug when showing lower_case_file_system
strings/ctype-tis620.c:
  Remove compiler warnings
2004-05-19 16:38:12 +03:00
unknown
e505696ffc Portability fixes for Windows
VC++Files/client/mysqlclient.dsp:
  Update for windows
VC++Files/libmysql/libmysql.dsp:
  Update for windows
VC++Files/strings/strings.dsp:
  Update for windows
libmysqld/lib_sql.cc:
  Update for windows
scripts/make_win_src_distribution.sh:
  Update for windows
scripts/mysql_install_db.sh:
  Update for windows
sql/mysqld.cc:
  Remove not used variable
sql/set_var.cc:
  Indentation cleanups
sql/share/czech/errmsg.txt:
  Fixed wrong delimiters
sql/share/danish/errmsg.txt:
  Fixed wrong delimiters
sql/share/dutch/errmsg.txt:
  Fixed wrong delimiters
sql/share/english/errmsg.txt:
  Fixed wrong delimiters
sql/share/estonian/errmsg.txt:
  Fixed wrong delimiters
sql/share/french/errmsg.txt:
  Fixed wrong delimiters
sql/share/greek/errmsg.txt:
  Fixed wrong delimiters
sql/share/hungarian/errmsg.txt:
  Fixed wrong delimiters
sql/share/italian/errmsg.txt:
  Fixed wrong delimiters
sql/share/japanese/errmsg.txt:
  Fixed wrong delimiters
sql/share/korean/errmsg.txt:
  Fixed wrong delimiters
sql/share/norwegian-ny/errmsg.txt:
  Fixed wrong delimiters
sql/share/norwegian/errmsg.txt:
  Fixed wrong delimiters
sql/share/polish/errmsg.txt:
  Fixed wrong delimiters
sql/share/portuguese/errmsg.txt:
  Fixed wrong delimiters
sql/share/romanian/errmsg.txt:
  Fixed wrong delimiters
sql/share/russian/errmsg.txt:
  Fixed wrong delimiters
sql/share/serbian/errmsg.txt:
  Fixed wrong delimiters
sql/share/slovak/errmsg.txt:
  Fixed wrong delimiters
sql/share/spanish/errmsg.txt:
  Fixed wrong delimiters
sql/share/swedish/errmsg.txt:
  Fixed wrong delimiters
sql/share/ukrainian/errmsg.txt:
  Fixed wrong delimiters
sql/sql_acl.cc:
  Removed compiler warnings
strings/ctype-big5.c:
  Removed compiler warnings (VC++)
strings/ctype-euc_kr.c:
  Removed compiler warnings (VC++)
strings/ctype-gb2312.c:
  Removed compiler warnings (VC++)
strings/ctype-gbk.c:
  Removed compiler warnings (VC++)
strings/ctype-sjis.c:
  Removed compiler warnings (VC++)
strings/ctype-ucs2.c:
  Removed compiler warnings (VC++)
strings/ctype-ujis.c:
  Removed compiler warnings (VC++)
2003-12-08 12:25:37 +02:00