mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
532 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
unknown
|
ff51fe45d3 |
merge
BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged ndb/include/Makefile.am: 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/Logger.cpp: Auto merged ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged ndb/src/common/util/Makefile.am: Auto merged ndb/src/common/util/version.c: Auto merged ndb/src/kernel/blocks/dbacc/Makefile.am: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.hpp: 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/vm/Configuration.cpp: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/mgmsrv/CommandInterpreter.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/Makefile.am: Auto merged ndb/src/ndbapi/NdbBlob.cpp: Auto merged ndb/src/ndbapi/NdbConnection.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged ndb/src/ndbapi/ndberror.c: Auto merged ndb/test/ndbapi/Makefile.am: Auto merged ndb/test/tools/Makefile.am: Auto merged ndb/tools/Makefile.am: Auto merged scripts/make_win_src_distribution.sh: Auto merged |
||
|
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 |
||
|
unknown
|
8379b61efb |
Merge with new VARCHAR code
configure.in: Auto merged BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Auto merged BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e: Auto merged BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged heap/hp_create.c: Auto merged heap/hp_delete.c: Auto merged heap/hp_hash.c: Auto merged heap/hp_write.c: Auto merged include/decimal.h: Auto merged include/m_ctype.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/Makefile.am: Auto merged myisam/mi_check.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_write.c: Auto merged mysql-test/r/ctype_tis620.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/endspace.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/strict.test: Auto merged mysql-test/t/type_blob.test: Auto merged ndb/src/common/util/NdbSqlUtil.cpp: Auto merged scripts/mysql_fix_privilege_tables.sh: Auto merged sql/field.h: Auto merged sql/field_conv.cc: Auto merged sql/ha_heap.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_sum.cc: Auto merged sql/protocol.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_help.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/structs.h: Auto merged sql/table.cc: Auto merged strings/ctype-czech.c: Auto merged strings/ctype-uca.c: Auto merged strings/ctype-utf8.c: Auto merged strings/ctype-win1250ch.c: Auto merged strings/decimal.c: Auto merged tests/client_test.c: Auto merged mysql-test/r/bdb.result: Merge with VARCHAR code mysql-test/r/heap.result: Merge with VARCHAR code mysql-test/r/innodb.result: Merge with VARCHAR code mysql-test/r/select.result.es: Merge with VARCHAR code mysql-test/t/bdb.test: Merge with VARCHAR code mysql-test/t/heap.test: Merge with VARCHAR code mysql-test/t/innodb.test: Merge with VARCHAR code sql/field.cc: Merge with VARCHAR code sql/item.cc: Merge with VARCHAR code sql/sql_acl.cc: Merge with VARCHAR code sql/sql_parse.cc: Merge with VARCHAR code sql/sql_table.cc: Merge with VARCHAR code sql/sql_update.cc: Merge with VARCHAR code sql/table.h: Merge with VARCHAR code strings/ctype-mb.c: Don't pad my_like_range with max_str for simple LIKE expression strings/ctype-tis620.c: Merge with VARCHAR code strings/ctype-ucs2.c: Added new argument to my_strnncollsp_ucs2() Simply code |
||
|
unknown
|
796bd7de96 |
Merge with 4.1
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged Build-tools/Do-compile: Auto merged client/mysqladmin.cc: Auto merged configure.in: Auto merged innobase/include/lock0lock.h: Auto merged innobase/os/os0file.c: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/heap.result: Auto merged mysql-test/r/insert_select.result: Auto merged mysql-test/r/lowercase_table3.result: Auto merged mysql-test/r/rpl_start_stop_slave.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/rpl_until.test: Auto merged mysql-test/t/subselect.test: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_myisam.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/lock.cc: Auto merged sql/log_event.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/log_event.cc: Merge with 4.1 Trivial cleanup |
||
|
unknown
|
a8ea31fae6 |
Add support for up to VARCHAR (size up to 65535)
Renamed HA_VAR_LENGTH to HA_VAR_LENGTH_PART Renamed in all files FIELD_TYPE_STRING and FIELD_TYPE_VAR_STRING to MYSQL_TYPE_STRING and MYSQL_TYPE_VAR_STRING to make it easy to catch all possible errors Added support for VARCHAR KEYS to heap Removed support for ISAM Now only long VARCHAR columns are changed to TEXT on demand (not CHAR) Internal temporary files can now use fixed length tables if the used VARCHAR columns are short BitKeeper/deleted/.del-ha_isam.cc~4dce65904db2675e: Delete: sql/ha_isam.cc BitKeeper/deleted/.del-_cache.c~b5d80b5c3ae233b1: Delete: isam/_cache.c BitKeeper/deleted/.del-_dbug.c~88d7964ae5e3c9bd: Delete: isam/_dbug.c BitKeeper/deleted/.del-_dynrec.c~48dd758f5a5450df: Delete: isam/_dynrec.c BitKeeper/deleted/.del-_key.c~ce62d47a6c681084: Delete: isam/_key.c BitKeeper/deleted/.del-_locking.c~dea4cdc6ea425c67: Delete: isam/_locking.c BitKeeper/deleted/.del-_packrec.c~47ae1b16c007e9be: Delete: isam/_packrec.c BitKeeper/deleted/.del-_page.c~148b1a613d052ee8: Delete: isam/_page.c BitKeeper/deleted/.del-_search.c~f509292aa1ff18ff: Delete: isam/_search.c BitKeeper/deleted/.del-_statrec.c~58d9263b3475d58b: Delete: isam/_statrec.c BitKeeper/deleted/.del-changed.c~d075de80a314b02d: Delete: isam/changed.c BitKeeper/deleted/.del-close.c~fd62629496ee5bcc: Delete: isam/close.c BitKeeper/deleted/.del-create.c~96cecc433c0c2242: Delete: isam/create.c BitKeeper/deleted/.del-delete.c~65ee8daaa75a14b6: Delete: isam/delete.c BitKeeper/deleted/.del-extra.c~706f29d72beb2565: Delete: isam/extra.c BitKeeper/deleted/.del-info.c~96cfb747af8da0d: Delete: isam/info.c BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f: Delete: isam/isamchk.c BitKeeper/deleted/.del-isamlog.c~85b6b31c6e2b8519: Delete: isam/isamlog.c BitKeeper/deleted/.del-log.c~55a973013d55cade: Delete: isam/log.c BitKeeper/deleted/.del-open.c~95b3b75042fae00a: Delete: isam/open.c BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834: Delete: isam/pack_isam.c BitKeeper/deleted/.del-panic.c~f7fd71605324f8f3: Delete: isam/panic.c BitKeeper/deleted/.del-range.c~142f1f8ac4948082: Delete: isam/range.c BitKeeper/deleted/.del-rfirst.c~66f494291dc005d3: Delete: isam/rfirst.c BitKeeper/deleted/.del-rkey.c~cc54c6498352f999: Delete: isam/rkey.c BitKeeper/deleted/.del-rlast.c~d1fe1866139e9866: Delete: isam/rlast.c BitKeeper/deleted/.del-rnext.c~b308eaa1e11ea7de: Delete: isam/rnext.c BitKeeper/deleted/.del-rprev.c~b359f71fdea4bbce: Delete: isam/rprev.c BitKeeper/deleted/.del-rrnd.c~7fcfcce88d4a5200: Delete: isam/rrnd.c BitKeeper/deleted/.del-rsame.c~75a62d5548103a15: Delete: isam/rsame.c BitKeeper/deleted/.del-rsamepos.c~5b5652dd2cda6d5d: Delete: isam/rsamepos.c BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4: Delete: isam/sort.c BitKeeper/deleted/.del-static.c~3a1354b84f4a9cc7: Delete: isam/static.c BitKeeper/deleted/.del-test1.c~64d52e9412d457ed: Delete: isam/test1.c BitKeeper/deleted/.del-test2.c~2f9a632cab572958: Delete: isam/test2.c BitKeeper/deleted/.del-test3.c~e8a7a4afe8a087: Delete: isam/test3.c BitKeeper/deleted/.del-isamdef.h~ac8d49e7e2201c66: Delete: isam/isamdef.h BitKeeper/deleted/.del-update.c~670264f51dc44934: Delete: isam/update.c BitKeeper/deleted/.del-write.c~8f1918b1f6770e54: Delete: isam/write.c BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09: Delete: isam/Makefile.am BitKeeper/deleted/.del-make-ccc~3ee55391eda0b0ab: Delete: isam/make-ccc BitKeeper/deleted/.del-ChangeLog~208984fb7a51e568: Delete: isam/ChangeLog BitKeeper/deleted/.del-test_all.res~c2aafb49a3a77db7: Delete: isam/test_all.res BitKeeper/deleted/.del-test_all~93c701e44a9c5b65: Delete: isam/test_all BitKeeper/deleted/.del-.cvsignore~54f6f0f2d5012561: Delete: isam/.cvsignore BitKeeper/deleted/.del-ha_isammrg.cc~dc682e4755d77a2e: Delete: sql/ha_isammrg.cc BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927: Delete: sql/ha_isam.h BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc: Delete: sql/ha_isammrg.h acinclude.m4: Remove ISAM client/mysqldump.c: FIELD_TYPE -> MYSQL_TYPE client/mysqltest.c: Add missing DBUG_RETURN configure.in: Remove ISAM heap/heapdef.h: Add support for VARCHAR heap/hp_create.c: Add support for VARCHAR heap/hp_delete.c: Add support for VARCHAR heap/hp_hash.c: Add support for VARCHAR (VARCHAR keys was not supported before) heap/hp_rkey.c: Add support for VARCHAR heap/hp_update.c: Add support for VARCHAR heap/hp_write.c: Add support for VARCHAR (Added flag SEARCH_UPDATE to mark that this is an update) include/decimal.h: Remove not needed my_global.h include/m_ctype.h: Add support for VARCHAR include/my_base.h: Add support for VARCHAR include/my_handler.h: Moved general purpose macro from MyISAM code include/mysql_com.h: Add support for VARCHAR libmysql/libmysql.c: Add support for VARCHAR libmysqld/Makefile.am: Removed ISAM myisam/ft_static.c: Add support for VARCHAR myisam/ft_test1.c: Add support for VARCHAR myisam/ft_update.c: Add support for VARCHAR myisam/mi_check.c: Add support for VARCHAR myisam/mi_create.c: Add support for VARCHAR - VARCHAR key segments are marked with HA_VAR_LENGTH_PART myisam/mi_key.c: Add support for VARCHAR Fixed bug in old VARCHAR code when reading index-only myisam/mi_range.c: Fixed comment style myisam/mi_rnext_same.c: Handle case where equal keys can be of different length myisam/mi_search.c: Add support for VARCHAR myisam/mi_test1.c: Add support for VARCHAR myisam/mi_unique.c: Add support for VARCHAR (Some new code to handle keys that are equal but have different lengths) myisam/mi_write.c: Fixed comment myisam/myisamchk.c: Better infotext if wrong type mysql-test/r/bdb.result: Updated old result and new results for VARCHAR mysql-test/r/create.result: Updated old result and new results for VARCHAR mysql-test/r/ctype_tis620.result: Updated old result and new results for VARCHAR (Old code sorted tis620 wrong) mysql-test/r/ctype_ucs.result: Updated old result and new results for VARCHAR mysql-test/r/endspace.result: Updated old result and new results for VARCHAR mysql-test/r/func_like.result: Updated old result and new results for VARCHAR mysql-test/r/heap.result: Updated old result and new results for VARCHAR mysql-test/r/innodb.result: Updated old result. This will change a bit when also InnoDB supports VARCHAR mysql-test/r/merge.result: Updated old result and new results for VARCHAR mysql-test/r/myisam.result: Updated old result and new results for VARCHAR mysql-test/r/mysqldump.result: Updated old result and new results for VARCHAR mysql-test/r/order_by.result: Updated old result and new results for VARCHAR (Key length is different for VARCHAR) mysql-test/r/ps.result: Updated old result and new results for VARCHAR mysql-test/r/ps_1general.result: Updated results for new .frm version Don't print seconds in show full process list as this may change mysql-test/r/ps_2myisam.result: Updated old result and new results for VARCHAR mysql-test/r/ps_3innodb.result: Updated old result and new results for VARCHAR mysql-test/r/ps_4heap.result: Updated old result and new results for VARCHAR mysql-test/r/ps_5merge.result: Updated old result and new results for VARCHAR mysql-test/r/ps_6bdb.result: Updated old result and new results for VARCHAR mysql-test/r/select.result.es: Updated results by hand mysql-test/r/select.result: Updated old result and new results for VARCHAR mysql-test/r/select_found.result: Updated old result and new results for VARCHAR mysql-test/r/show_check.result: Updated old result and new results for VARCHAR mysql-test/r/strict.result: Updated old result and new results for VARCHAR mysql-test/r/subselect.result: Updated old result and new results for VARCHAR mysql-test/r/system_mysql_db.result: Updated old result and new results for VARCHAR mysql-test/r/type_blob.result: Updated old result and new results for VARCHAR mysql-test/r/type_ranges.result: Updated old result and new results for VARCHAR mysql-test/r/type_ranges.result.es: Updated some results by hand mysql-test/t/bdb.test: Test VARCHAR mysql-test/t/ctype_ucs.test: Some fixes related to VARCHAR mysql-test/t/endspace.test: Fixes to make it easier to compare columns with end space mysql-test/t/heap.test: Test VARCHAR mysql-test/t/innodb.test: Prepare for testing VARCHAR mysql-test/t/myisam.test: Test VARCHAR mysql-test/t/ps_1general.test: Don't show seconds for show processlist mysql-test/t/ps_4heap.test: Update for VARCHAR mysql-test/t/strict.test: Fix test for VARCHAR mysql-test/t/type_blob.test: Update test for VARCHAR Note that now you can't store 'a' and 'a ' in an unique varchar/text index if the column is not binary mysys/my_handler.c: Add support for VARCHAR ndb/src/common/util/NdbSqlUtil.cpp: Fix for usage of strnncollsp scripts/mysql_fix_privilege_tables.sh: Simple fix so that my_print_defaults works sql/Makefile.am: Remove ISAM sql/field.cc: Add support for VARCHAR Fixed the keys for blob's are compared with strnncollsp Ensure that old tables from MySQL 4.0 works as they did before. (Old VARCHAR will be converted to new VARCHAR on ALTER TABLE) sql/field.h: Add support for VARCHAR sql/field_conv.cc: Change FIELD_TYPE_VAR_STRING -> MYSQL_TYPE_VARCHAR Added usage of HA_KEY_BLOB_LENGTH sql/ha_berkeley.cc: Add support for VARCHAR Added usage of table->insert_or_update if we would ever want to know in key_cmp if we are changing keys sql/ha_heap.cc: Add support for VARCHAR sql/ha_innodb.cc: Changed MYSQL_TYPE_VAR_STRING to MYSQL_TYPE_VARCHAR. Waiting for Heikki to add full VARCHAR support sql/ha_innodb.h: InnoDB doesn't support full VARCHAR yet sql/ha_myisam.cc: Add support for VARCHAR sql/ha_ndbcluster.cc: Add support for VARCHAR sql/handler.h: Added HA_NO_VARCHAR for table handler that doesn't support VARCHAR. In this case MySQL will create a normal CHAR instead sql/item.cc: Fixed access of already freed memory Added support of VARCHAR - varchar length is now checked in mysql_prepare sql/item_cmpfunc.cc: Added new parameter to strncollsp sql/item_sum.cc: Added new parameter to strncollsp FIELD_TYPE -> MYSQL_TYPE sql/key.cc: Add support for VARCHAR sql/opt_range.cc: Remove character set parameter from set_key_image() sql/opt_sum.cc: Remove character set parameter from set_key_image() sql/protocol.cc: Return MYSQL_TYPE_VAR_STRING instead of MYSQL_TYPE_VARCHAR to clients (to not cause compatiblity problems) sql/sql_acl.cc: Change key handling code so that we can use CHAR or VARCHAR for the user table columns sql/sql_base.cc: Remove old, not used code sql/sql_help.cc: Remove charset from get_key_image sql/sql_parse.cc: Ensure that OPTION_TABLE_LOCK is cleared ASAP; This fixed a problem in BDB transaction code when one used LOCK TABLES on a BDB table Added support for VARCHAR Moved field length checking and VARCHAR -> TEXT convert to mysql_prepare (as we need the know the character set for the column) sql/sql_select.cc: Added support of VARCHAR Added heuristic to use fixed size rows for tmp tables if we are using only a few short VARCHAR's sql/sql_string.cc: Added extra argument to strnncollsp sql/sql_table.cc: Add support for VARCHAR Automaticly convert (with warning) big VARCHAR (but not CHAR) to TEXT If handler doesn't support VARCHAR convert VARCHAR to CHAR sql/sql_update.cc: Fixed compiler warning sql/sql_yacc.yy: Add support for VARCHAR sql/strfunc.cc: Fixed valgrind warning sql/structs.h: Added 'table' to KEY structure to make life easier for some handler functions sql/table.cc: Add support for VARCHAR - New .frm version - FIELD_TYPE -> MYSQL_TYPE sql/table.h: Added insert_or_update; A bool flag a handler can set/reset if needed (for handler internal usage) sql/unireg.h: Add support for VARCHAR strings/ctype-big5.c: Added new argument to strnncollsp() to allow one to define if end space are significant or not Changed my_like_range... to correctly calculate min_length & max_length strings/ctype-bin.c: Added new argument to strnncollsp() to allow one to define if end space are significant or not strings/ctype-czech.c: Changed my_like_range... to correctly calculate min_length & max_length strings/ctype-gbk.c: Added new argument to strnncollsp() to allow one to define if end space are significant or not Changed my_like_range... to correctly calculate min_length & max_length strings/ctype-latin1.c: Added new argument to strnncollsp() to allow one to define if end space are significant or not strings/ctype-mb.c: Added new argument to strnncollsp() to allow one to define if end space are significant or not Changed my_like_range... to correctly calculate min_length & max_length strings/ctype-simple.c: Added new argument to strnncollsp() to allow one to define if end space are significant or not Changed my_like_range... to correctly calculate min_length & max_length strings/ctype-sjis.c: Added new argument to strnncollsp() to allow one to define if end space are significant or not Changed my_like_range... to correctly calculate min_length & max_length strings/ctype-tis620.c: Added new argument to strnncollsp() to allow one to define if end space are significant or not Changed my_like_range... to correctly calculate min_length & max_length strings/ctype-uca.c: Added new argument to strnncollsp() to allow one to define if end space are significant or not strings/ctype-ucs2.c: Changed my_like_range... to correctly calculate min_length & max_length strings/ctype-utf8.c: Added new argument to strnncollsp() to allow one to define if end space are significant or not strings/ctype-win1250ch.c: Changed my_like_range... to correctly calculate min_length & max_length strings/decimal.c: Fixed include files usage Fixed some compiler warnings tests/client_test.c: Ensure tests works with VARCHAR |
||
|
unknown
|
0a6699d685 |
mysqld_safe.sh:
Fix calls to my_print_defaults. Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option. NOTE: this may make some installations behave differently, if they depend on this broken behavior. scripts/mysqld_safe.sh: Fix calls to my_print_defaults. Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option. NOTE: this may make some installations behave differently, if they depend on this broken behavior. |
||
|
unknown
|
8b244fc665 |
merged
BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged innobase/srv/srv0srv.c: Auto merged mysql-test/r/rpl_start_stop_slave.result: Auto merged scripts/mysql_fix_privilege_tables.sh: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.h: Auto merged sql/slave.cc: Auto merged mysql-test/r/select.result: !bk-eb mysql-test/t/select.test: !bk-eb |
||
|
unknown
|
dd33501f9e |
merged
BitKeeper/etc/logging_ok: auto-union innobase/srv/srv0srv.c: Auto merged mysql-test/t/select.test: Auto merged sql/item_cmpfunc.h: Auto merged sql/slave.cc: Auto merged |
||
|
unknown
|
60af920628 |
Fixes while reviewing code
(Cleanups and better bug fixes) mysql-test/r/select.result: Fixed test after wrong merge mysql-test/t/select.test: Fixed test after wrong merge scripts/mysql_fix_privilege_tables.sh: Don't read defaults files sql/item_cmpfunc.cc: Fix wrong value for not_null_tables_cache sql/item_cmpfunc.h: Remove wrong patch (flags are set in fix_length_and_dec()) sql/item_func.h: Fix wrong value for not_null_tables_cache sql/slave.cc: Fixed indentation |
||
|
unknown
|
74735b3d86 |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744 BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged |
||
|
unknown
|
19c2ce47db |
Merge with 4.1
BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-Makefile.am: Auto merged BitKeeper/deleted/.del-Makefile.am~1: Delete: Docs/Images/Makefile.am client/mysqltest.c: Auto merged include/mysql.h: Auto merged libmysql/libmysql.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/r/grant.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/t/grant.test: Auto merged mysql-test/t/mix_innodb_myisam_binlog.test: Auto merged mysql-test/t/ps_1general.test: Auto merged sql/field.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/mysqld.cc: Auto merged sql/share/french/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/sql_acl.cc: Auto merged sql/sql_table.cc: Auto merged sql/time.cc: Auto merged sql-common/my_time.c: Auto merged sql/share/portuguese/errmsg.txt: Auto merged sql/share/romanian/errmsg.txt: Auto merged sql/share/serbian/errmsg.txt: Auto merged sql/share/spanish/errmsg.txt: Auto merged sql/share/swedish/errmsg.txt: Auto merged configure.in: Merge with 4.0 mysql-test/r/mix_innodb_myisam_binlog.result: Merge with 4.0 mysys/default.c: Merge with 4.1 (to get new extension handling) sql/log.cc: Merge with 4.0 tests/client_test.c: Merge with 4.1 (to get possibility to run any tests) |
||
|
unknown
|
4e561d743f |
Merge on pull
sql/mysqld.cc: Auto merged |
||
|
unknown
|
5cc4a6e928 |
fill_help_tables.sh:
Recognize another Texinfo tag. scripts/fill_help_tables.sh: Recognize another Texinfo tag. |
||
|
unknown
|
44070705ea |
merge with 4.0
BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-Makefile.am: Delete: Docs/Images/Makefile.am Build-tools/Bootstrap: Auto merged Docs/Makefile.am: Auto merged configure.in: Auto merged include/mysql.h: Auto merged innobase/dict/dict0dict.c: Auto merged libmysql/libmysql.c: Auto merged mysys/default.c: Auto merged scripts/mysqld_safe.sh: Auto merged sql/log.cc: Auto merged mysql-test/t/mix_innodb_myisam_binlog.test: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_table.cc: Auto merged client/mysqldump.c: merge with 4.0 (This only reorders options) sql/ha_innodb.cc: merge with 4.0 (Keep original code) sql/time.cc: Note that part of this patch is done in my_time.c |
||
|
unknown
|
4d0e9ad917 |
Resolved merge from 4.1 -> 5.0 (mainly Guilhem's work with mysqldump)
BitKeeper/etc/ignore: auto-union configure.in: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged include/mysqld_error.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/ndb_autodiscover.result: Auto merged mysql-test/r/null.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/null.test: Auto merged ndb/src/mgmsrv/main.cpp: Auto merged sql/field.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_lex.h: 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/share/german/errmsg.txt: Auto merged sql/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/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/serbian/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 |
||
|
unknown
|
26c5503415 |
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744 ndb/src/ndbapi/ndberror.c: Auto merged |
||
|
unknown
|
bdea2dc949 |
fill_help_tables.sh:
Handle some additional Texinfo tags that were being missed. scripts/fill_help_tables.sh: Handle some additional Texinfo tags that were being missed. |
||
|
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 |
||
|
unknown
|
f0614a9fec |
wl1744 - ndb on windows
Add rules for creating dsp-files |
||
|
unknown
|
f5a47f156b |
Fixes after merge with 4.1
FOUND is not a reserved keyword anymore Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete BUILD/SETUP.sh: Portability fix client/mysqltest.c: Portability fix mysql-test/r/drop.result: updated results mysql-test/r/func_str.result: New warnings (after merge) mysql-test/r/insert.result: Updated tests mysql-test/r/join_nested.result: Updated results (because of new column types in 5.0) mysql-test/r/lock_multi.result: Temporarly wrong results until Sanja fixes multi-update-lock in 5.0 mysql-test/r/multi_update.result: Temporary fix until Sanja fixes multi-update locking mysql-test/r/ps_1general.result: Update of results after merge mysql-test/r/ps_2myisam.result: Update of results after merge mysql-test/r/ps_3innodb.result: Update of results after merge mysql-test/r/ps_4heap.result: Update of results after merge mysql-test/r/ps_5merge.result: Update of results after merge mysql-test/r/ps_6bdb.result: Update of results after merge mysql-test/r/query_cache.result: Update of results after merge mysql-test/r/range.result: New results for new tests mysql-test/r/rpl_auto_increment.result: Update with new 4.0 information mysql-test/r/rpl_charset.result: After merge fixes mysql-test/r/subselect.result: After merge fixes mysql-test/r/view.result: Temporary fix until multi-update-locking is fixed mysql-test/t/drop.test: Safety fix mysql-test/t/multi_update.test: Temporary fix until multi-update-locking is fixed mysql-test/t/rpl_charset.test: More comments mysql-test/t/sp-error.test: Updated comments mysql-test/t/view.test: Temporary fix until multi-update-locking is fixed scripts/mysql_fix_privilege_tables.sh: Better error message sql-common/client.c: More debugging sql/ha_ndbcluster.cc: After merge fixes sql/handler.cc: After merge fixes sql/item.cc: Simple optimization of creating item After merge fixed Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted The problem is that if you compare a string field to a binary string, you can't replace the field with a string constant as the binary comparison may then fail (The original field value may be in a different case) sql/item.h: Added Item::set_no_const_sub() to be able to mark fields that can't be substituted sql/item_cmpfunc.cc: Mark fields compared as binary to not be substituted. sql/item_func.cc: After merge fix sql/log_event.cc: After merge fix sql/mysql_priv.h: After merge fix sql/opt_range.cc: After merge fix sql/protocol.cc: Made flags uint instead of int (as it's used as a bit mask) sql/protocol.h: Made flags uint instead of int (as it's used as a bit mask) sql/protocol_cursor.cc: Made flags uint instead of int (as it's used as a bit mask) Indentation cleanups sql/sp.cc: After merge fixes Removed compiler warnings sql/sp_head.cc: After merge fixes sql/sql_base.cc: After merge fixes Removed 'send_error' from 'insert_fields()' as the error is sent higher up sql/sql_class.cc: Give assert if set_n_backup_item_arena is used twice sql/sql_class.h: Give assert if set_n_backup_item_arena is used twice After merge fixes Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT sql/sql_handler.cc: After merge fixes sql/sql_parse.cc: After merge fixes sql/sql_prepare.cc: After merge fixes sql/sql_select.cc: After merge fixes Moved 'build_equal_items' to optimize_cond() (logical place) sql/sql_table.cc: After merge fixes sql/sql_trigger.cc: After merge fixes sql/sql_update.cc: After merge fixes (This should be fixed by Sanja to have lower granuality locking of tables in multi-update) sql/sql_view.cc: After merge fixes sql/sql_yacc.yy: After merge fixes Don't have FOUND as a reserved keyword |
||
|
unknown
|
1d3f4a1a49 |
Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROC
for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself. configure.in: Portability fix for FIND_PROC setting; on Solaris (and probably others), 'ps -p $$' inside a shell script just returns 'sh' for command line, even though $0 contains the filename. So, use 'ps -fp $$' in the test (it shows the full command line, e.g., 'sh configure'). Leave the actual FIND_PROC command as-is, since mysqld itself is not a shell script. scripts/mysqld_safe.sh: Portability fix for mysqld_safe on non-Linux systems. A bogus use of 'if' and 'test' caused non-bash shells to enter a section meant to be run only on Linux systems. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted |
||
|
unknown
|
f095274fe8 |
merge with 4.1
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged Docs/Support/texi2html: Auto merged Makefile.am: Auto merged client/Makefile.am: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/my_time.h: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/include/row0mysql.h: Auto merged innobase/row/row0sel.c: Auto merged libmysql/libmysql.c: Auto merged libmysqld/examples/Makefile.am: Auto merged myisam/mi_check.c: Auto merged mysql-test/include/ps_modify.inc: Auto merged mysql-test/install_test_db.sh: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/auto_increment.result: Auto merged mysql-test/r/bdb.result: Auto merged mysql-test/r/ctype_latin1_de.result: Auto merged mysql-test/r/ctype_recoding.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_if.result: Auto merged mysql-test/t/derived.test: Auto merged mysql-test/t/insert.test: merge with 4.1 Fixed test case to not use 'if exists' when it shouldn't mysql-test/t/range.test: merge with 4.1 Added missing drop table sql/ha_ndbcluster.cc: merge with 4.1 Simple optimization: use max() instead of ? : sql/item_func.cc: merge with 4.1 (Added back old variable names for easier merges) sql/opt_range.cc: merge with 4.1 Removed argument 'parent_alloc' from QUICK_RANGE_SELECT as this was not used Added assert if using QUICK_GROUP_MIN_MAX_SELECT with parent_alloc as the init() function can't handle this Changed back get_quick_select_for_ref() to use it's own alloc root becasue this function may be called several times for one query sql/sql_handler.cc: merge with 4.1 change variable 'err' to 'error' as same function had a label named 'err' sql/sql_update.cc: Use multi-update code from 5.0 instead of 4.1 We will fix the locking code shortly in 5.0 to be faster than in 4.1 |
||
|
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).
|
||
|
unknown
|
d2cdceb2aa | use the right make in make_binary_distribution | ||
|
unknown
|
7bdb93aa7e |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1 BitKeeper/etc/logging_ok: auto-union innobase/srv/srv0srv.c: Auto merged |
||
|
unknown
|
a750003f57 |
Implemented the stored procedure data access characteristics:
NO SQL CONTAINS SQL (default) READS SQL DATA MODIFIES SQL DATA These are needed as hints for the replication. (Before this, we did have the default in the mysql.proc table, but no support in the parser.) mysql-test/r/sp.result: Modified test cases for new data access characteristics. mysql-test/t/sp.test: Modified test cases for new data access characteristics. scripts/mysql_create_system_tables.sh: We now support all the SP data access characteristics (not just CONTAINS SQL). scripts/mysql_fix_privilege_tables.sql: We now support all the SP data access characteristics (not just CONTAINS SQL). sql/lex.h: New tokens for SP data access characteristics. sql/sp.cc: Store, print and support alter of data access characteristics. sql/sp_head.cc: Added SP_ prefix to some symbols. sql/sql_lex.h: Added SP_ prefix to some symbols, and added SP data access enum. sql/sql_yacc.yy: Parse SP data access characteristics. (And allow "alter ... language sql", mostly as a formality, it was accidently put in the wrong clause before.) |
||
|
unknown
|
db261af7f4 | Added documentation. | ||
|
unknown
|
5ef26f98c4 |
Improved mysqld_multi documentation, especially the --example
section, which had gotten somewhat out-dated. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted |
||
|
unknown
|
f1eefa472c |
Added some extra information to output in case --verbose
was given. |
||
|
unknown
|
412f9da8c6 |
- Added --verbose
- Made some of the warnings under --verbose only - Added possibility to add mysqladmin= under groups [mysqldN] mysqladmin=... is no longer mandatory under [mysqld_multi] - Made 'start', 'stop' and 'report' commands truly case-insensitive - Some other common places code merge and cleanup |
||
|
unknown
|
865a0d1cab |
mysql-test-run.sh:
Look for 'client_test' in tests/ not bin/ make_binary_distribution.sh: Copy 'client_test' into the dist scripts/make_binary_distribution.sh: Copy 'client_test' into the dist mysql-test/mysql-test-run.sh: Look for 'client_test' in tests/ not bin/ |
||
|
unknown
|
53ff8fd939 |
Changed a fatal error to a warning in case the default mysqld
binary for mysqld_multi was not found. This is because it is possible to define one under each mysqldN group separately. Bailing out if mysqld binary is not found at all. Added option --silent to turn off warnings. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted |
||
|
unknown
|
aa14d7361d |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1 BitKeeper/etc/logging_ok: auto-union |
||
|
unknown
|
b5f445a0e9 |
Merge
BitKeeper/etc/logging_ok: auto-union innobase/include/sync0arr.h: Auto merged innobase/sync/sync0arr.c: Auto merged scripts/mysqlhotcopy.sh: Auto merged innobase/srv/srv0srv.c: SCCS merged |
||
|
unknown
|
c9465b9158 | Fixed a bug in --log option. | ||
|
unknown
|
66bdcf8439 |
Fixed Bug#5575, mysqlhotcopy is broken when using --noindices
BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted |
||
|
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) |
||
|
unknown
|
81edee8100 |
Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build |
||
|
unknown
|
bbab9ec678 |
Merge with 4.0 for 4.1 release
Noteworthy: - New HANDLER code - New multi-update-grant-check code - Table lock code in ha_innodb.cc was not applied BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e: Auto merged Build-tools/mysql-copyright-2: Auto merged acinclude.m4: Auto merged client/mysqladmin.c: Auto merged client/mysqldump.c: Auto merged include/config-win.h: Auto merged include/my_global.h: Auto merged include/myisam.h: Auto merged innobase/btr/btr0btr.c: Auto merged innobase/buf/buf0buf.c: Auto merged ltmain.sh: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/fsp/fsp0fsp.c: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/row0mysql.h: Auto merged innobase/log/log0log.c: Auto merged innobase/log/log0recv.c: Auto merged innobase/pars/pars0opt.c: Auto merged innobase/row/row0row.c: Auto merged innobase/sync/sync0arr.c: Auto merged innobase/ut/ut0dbg.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_close.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_locking.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/r/delete.result: Auto merged mysql-test/r/func_if.result: Auto merged Build-tools/mysql-copyright: Merge with 4.0 (too most of the code from 4.0) Makefile.am: merge client/mysql.cc: Used 4.1 code configure.in: merge innobase/os/os0file.c: merge innobase/row/row0mysql.c: merge mysql-test/r/ctype_latin1_de.result: merge mysql-test/r/flush_table.result: merge mysql-test/r/func_str.result: merge mysql-test/r/handler.result: merge mysql-test/r/multi_update.result: merge mysql-test/r/type_timestamp.result: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/r/update.result: merge mysql-test/t/delete.test: merge mysql-test/t/flush_table.test: merge mysql-test/t/func_str.test: merge mysql-test/t/handler.test: merge mysql-test/t/multi_update.test: merge mysql-test/t/type_timestamp.test: Removed testing of 'new' mode, as this is only relevant for 4.0 mysql-test/t/update.test: merge mysys/errors.c: merge mysys/my_fstream.c: merge mysys/my_pread.c: merge mysys/my_write.c: merge mysys/mysys_priv.h: merge scripts/mysqlhotcopy.sh: merge sql/field.cc: Keep code from 4.1 sql/field.h: Keep code from 4.1 sql/ha_innodb.cc: Don't merge lock code from 4.0; Heikki will look at this sql/ha_myisam.cc: merge sql/handler.cc: merge sql/item_cmpfunc.cc: merge sql/item_cmpfunc.h: merge sql/item_strfunc.cc: merge sql/mysql_priv.h: merge sql/mysqld.cc: merge sql/protocol.cc: merge sql/records.cc: merge sql/repl_failsafe.cc: merge mysql-test/r/lock_multi.result: merge mysql-test/t/ctype_latin1_de.test: merge mysql-test/t/func_if.test: merge mysql-test/t/lock_multi.test: merge sql/repl_failsafe.h: merge Remove unnessessary header protection sql/slave.h: merge sql/sql_acl.cc: merge sql/sql_base.cc: merge sql/sql_cache.cc: auto merge sql/sql_class.cc: merge sql/sql_class.h: merge sql/sql_delete.cc: merge sql/sql_handler.cc: Get new HANDLER code into 4.1 sql/sql_parse.cc: Keep old file sql/sql_repl.cc: merge sql/sql_repl.h: merge sql/sql_show.cc: merge sql/sql_table.cc: merge sql/sql_union.cc: Applied the examine_rows bug fix from 4.0 by hand sql/sql_update.cc: New multi-update-grant-check code from 4.0 sql/sql_yacc.yy: New multi-update-grant-check code from 4.0 sql/stacktrace.c: merge sql/table.h: merge |
||
|
unknown
|
b91838fcfd | - Rename the *.cnf files to *.ini for the Windows source distribution | ||
|
unknown
|
6966e86951 |
More fixes for strict mode:
More tests. Better error messages. Fixed bug when checking if we updated all needed columns for INSERT. Give an error if we encounter a wrong float value during parsing. Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS. Fixed UPDATE IGNORE when using STRICT mode. include/mysqld_error.h: More error messages for strict mode include/sql_state.h: Fixed wrong state New error message mysql-test/r/alter_table.result: Updated results for not automatic default fields mysql-test/r/auto_increment.result: Better error messages mysql-test/r/create.result: Updated results for not automatic default fields Better error messages mysql-test/r/ctype_collate.result: Updated results for not automatic default fields mysql-test/r/ctype_latin1_de.result: Updated results for not automatic default fields mysql-test/r/ctype_many.result: Updated results for not automatic default fields mysql-test/r/ctype_recoding.result: Updated results for not automatic default fields mysql-test/r/gis-rtree.result: Updated results for not automatic default fields mysql-test/r/gis.result: Updated results for not automatic default fields mysql-test/r/innodb.result: Updated results for not automatic default fields mysql-test/r/insert.result: Better error messages mysql-test/r/insert_select.result: Better error messages mysql-test/r/isam.result: Updated results for not automatic default fields mysql-test/r/key.result: Better error messages mysql-test/r/merge.result: Updated results for not automatic default fields mysql-test/r/null.result: Better error messages mysql-test/r/null_key.result: Better error messages mysql-test/r/ps_1general.result: Updated results for not automatic default fields mysql-test/r/select.result: Drop views that may interfere with later results mysql-test/r/show_check.result: Updated results for not automatic default fields mysql-test/r/sp.result: Updated results for not automatic default fields mysql-test/r/strict.result: More tests mysql-test/r/type_set.result: Updated results for not automatic default fields mysql-test/r/warnings.result: Better error messages mysql-test/t/insert.test: Using wrong float values now gives an error mysql-test/t/select.test: Drop views that may interfere with later results mysql-test/t/strict.test: More tests scripts/mysql_fix_privilege_tables.sql: Add missing DEFAULT's sql/field.cc: Fix some strict mode issues for float and double sql/field.h: Fix DEFAULT handling sql/item.cc: Give an error if we encounter a wrong float value during parsing. Give an error if we use DEFAULT() on a field that doesn't have a default value. sql/item.h: Give an error if we encounter a wrong float value during parsing. sql/mysqld.cc: More debug info sql/share/czech/errmsg.txt: Better error messages sql/share/danish/errmsg.txt: Better error messages sql/share/dutch/errmsg.txt: Better error messages sql/share/english/errmsg.txt: Better error messages sql/share/estonian/errmsg.txt: Better error messages sql/share/french/errmsg.txt: Better error messages sql/share/german/errmsg.txt: Better error messages sql/share/greek/errmsg.txt: Better error messages sql/share/hungarian/errmsg.txt: Better error messages sql/share/italian/errmsg.txt: Better error messages sql/share/japanese/errmsg.txt: Better error messages sql/share/korean/errmsg.txt: Better error messages sql/share/norwegian-ny/errmsg.txt: Better error messages sql/share/norwegian/errmsg.txt: Better error messages sql/share/polish/errmsg.txt: Better error messages sql/share/portuguese/errmsg.txt: Better error messages sql/share/romanian/errmsg.txt: Better error messages sql/share/russian/errmsg.txt: Better error messages sql/share/serbian/errmsg.txt: Better error messages sql/share/slovak/errmsg.txt: Better error messages sql/share/spanish/errmsg.txt: Better error messages sql/share/swedish/errmsg.txt: Better error messages sql/share/ukrainian/errmsg.txt: Better error messages sql/sql_insert.cc: Fixed bug in last push of checking of default values. sql/sql_parse.cc: Enum fields has always a default value sql/sql_show.cc: Don't print DEFAULT for columns without a default value in SHOW CREATE/SHOW FIELDS sql/sql_table.cc: Fixed storing/retrieving of NO_DEFAULT_VALUE_FLAG sql/sql_update.cc: Don't abort for wrong values for UPDATE IGNORE sql/sql_yacc.yy: Abort if we find a wrong float value sql/table.cc: Fixed storing/retrieving of NO_DEFAULT_VALUE_FLAG |
||
|
unknown
|
e429f2d683 |
mysql_install_db should do skip-ndbcluster
set a printout in SocketClient only for debug ndb/src/common/util/SocketClient.cpp: set a printout only for debug scripts/mysql_install_db.sh: mysql_install_db should do skip-ndbcluster |
||
|
unknown
|
8bf8c85968 |
another small change for bug 5531
scripts/mysqlhotcopy.sh: one more \' to remove for bugfix 5531! |
||
|
unknown
|
1d6ea1611b |
fixed bug 5531
scripts/mysqlhotcopy.sh: small fix to help options per bug 5531 |
||
|
unknown
|
5d7848d8bf |
fixed privilege system upgrade script, to allow VIEW privileges for used who have CREATE privilege (BUG#5329)
scripts/mysql_fix_privilege_tables.sql: fixed privilege system upgrade script, to allow VIEW privileges for used who have CREATE privilege |
||
|
unknown
|
8eb279d4bc |
Fix for bug #5396(libmysql depends on SSL)
Since libmysqld has libmysql's capabilities it needs lssl to compile scripts/mysql_config.sh: client libraries added to the embedded_libs |
||
|
unknown
|
77a8615488 |
merged
BitKeeper/etc/ignore: auto-union client/mysqlcheck.c: Auto merged myisammrg/myrg_open.c: Auto merged scripts/mysqld_safe.sh: Auto merged sql/sql_analyse.cc: Auto merged |
||
|
unknown
|
6b1444d7ba | better fix for bug#5001 | ||
|
unknown
|
4ad51359c1 |
Merge with 4.1
(Includes merge of arena code in 4.1 and 5.0) BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union VC++Files/sql/mysqld.dsp: Auto merged client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged innobase/row/row0sel.c: Auto merged libmysql/client_settings.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/examples/Makefile.am: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/mi_check.c: Auto merged myisam/myisamchk.c: Auto merged myisam/sort.c: Auto merged mysql-test/r/connect.result: Auto merged mysql-test/r/ctype_recoding.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/func_in.result: Auto merged mysql-test/r/func_like.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/having.result: Auto merged mysql-test/r/heap.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/lowercase_table.result: Auto merged mysql-test/r/ndb_autodiscover.result: Auto merged mysql-test/r/null.result: Auto merged mysql-test/r/olap.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/rename.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/null.test: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/rpl_charset.test: Auto merged mysql-test/t/rpl_heap.test: Auto merged mysql-test/t/rpl_relayrotate.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/variables.test: Auto merged netware/mysql_test_run.c: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged scripts/mysql_install_db.sh: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/lex.h: Auto merged sql/lock.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_sum.cc: Auto merged sql/protocol.cc: Auto merged sql/records.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_string.h: Auto merged sql/table.cc: Auto merged sql-common/client.c: Auto merged client/mysqlbinlog.cc: Merge with 4.1 configure.in: Merge with 4.1 include/mysqld_error.h: Add new error message (1) from 4.1 mysql-test/mysql-test-run.sh: Merge with 4.1 mysql-test/r/func_gconcat.result: Merge with 4.1 mysql-test/r/func_if.result: Merge with 4.1 mysql-test/r/grant.result: Merge with 4.1 mysql-test/r/join_outer.result: Merge with 4.1 mysql-test/r/rpl_charset.result: Merge with 4.1 (This has to be fixed before pushing) mysql-test/r/system_mysql_db.result: Merge with 4.1. Added collation to new privileges mysql-test/t/grant.test: Merge with 4.1 mysql-test/t/grant_cache.test: Merge with 4.1 mysql-test/t/show_check.test: Merge with 4.1 sql/Makefile.am: Merge with 4.1 sql/item.cc: Merge with 4.1 sql/item_cmpfunc.cc: Merge with 4.1 (arena code) sql/item_subselect.cc: Merge with 4.1 sql/item_subselect.h: Merge with 4.1 sql/item_sum.cc: Merge with 4.1 sql/item_sum.h: Merge with 4.1 sql/log.cc: Merge with 4.1 (Remove code that is not relevant for 5.0) sql/mysqld.cc: Merge with 4.1 sql/opt_range.cc: Merge with 4.1 sql/share/czech/errmsg.txt: Merge with 4.1 sql/share/danish/errmsg.txt: Merge with 4.1 sql/share/dutch/errmsg.txt: Merge with 4.1 sql/share/english/errmsg.txt: Merge with 4.1 sql/share/estonian/errmsg.txt: Merge with 4.1 sql/share/french/errmsg.txt: Merge with 4.1 sql/share/german/errmsg.txt: Merge with 4.1 sql/share/greek/errmsg.txt: Merge with 4.1 sql/share/hungarian/errmsg.txt: Merge with 4.1 sql/share/italian/errmsg.txt: Merge with 4.1 sql/share/japanese/errmsg.txt: Merge with 4.1 sql/share/korean/errmsg.txt: Merge with 4.1 sql/share/norwegian-ny/errmsg.txt: Merge with 4.1 sql/share/norwegian/errmsg.txt: Merge with 4.1 sql/share/polish/errmsg.txt: Merge with 4.1 sql/share/portuguese/errmsg.txt: Merge with 4.1 sql/share/romanian/errmsg.txt: Merge with 4.1 sql/share/russian/errmsg.txt: Merge with 4.1 sql/share/serbian/errmsg.txt: Merge with 4.1 sql/share/slovak/errmsg.txt: Merge with 4.1 sql/share/spanish/errmsg.txt: Merge with 4.1 sql/share/swedish/errmsg.txt: Merge with 4.1 sql/share/ukrainian/errmsg.txt: Merge with 4.1 sql/sql_base.cc: Merge with 4.1 sql/sql_class.cc: Merge with 4.1 Use arena code from 4.1 sql/sql_class.h: Merge with 4.1 Use arena code from 4.1 sql/sql_derived.cc: Merge with 4.1 sql/sql_lex.cc: Merge with 4.1 sql/sql_lex.h: Merge with 4.1 sql/sql_parse.cc: Merge with 4.1 sql/sql_prepare.cc: Merge with 4.1 sql/sql_select.cc: Merge with 4.1 sql/sql_table.cc: Merge with 4.1 sql/sql_union.cc: Merge with 4.1 sql/sql_yacc.yy: Merge with 4.1 sql/tztime.cc: Merge with 4.1 tests/client_test.c: Merge with 4.1 |
||
|
unknown
|
e85e573971 |
Merge with 4.0 to get latest bug fixes
configure.in: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/t/merge.test: Auto merged scripts/mysqld_safe.sh: Auto merged sql/mysqld.cc: Auto merged sql/share/czech/errmsg.txt: Auto merged sql/share/danish/errmsg.txt: Auto merged sql/sql_yacc.yy: 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/share/greek/errmsg.txt: Auto merged sql/share/hungarian/errmsg.txt: Auto merged sql/share/italian/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/romanian/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 mysql-test/r/union.result: Merge with 4.0 mysql-test/t/union.test: Merge with 4.0 sql/ha_innodb.cc: Merge with 4.0 sql/share/german/errmsg.txt: Merge with 4.0 sql/share/portuguese/errmsg.txt: Merge with 4.0 sql/share/russian/errmsg.txt: Merge with 4.0 sql/sql_parse.cc: Merge with 4.0 sql/sql_union.cc: Merge with 4.0 (Keep 4.1 code) |