the rpm spec file changelog
sql/ha_innodb.cc:
- Merge: used local version (as the fix in 4.0 was a backport)
support-files/mysql.spec.sh:
- manual merge from 4.0
the MySQL-server RPM spec file (BUG#12348)
support-files/mysql.spec.sh:
- Fixed the creation of the mysql user group account in the postinstall section
(BUG#12348)
into mysql.com:/home/my/mysql-5.0
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-ctype_cp932.test:
Auto merged
BitKeeper/deleted/.del-isam.test~834fb0ee8196c445:
Auto merged
include/thr_lock.h:
Auto merged
mysql-test/t/alias.test:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/archive.test:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/bool.test:
Auto merged
mysql-test/t/connect.test:
Auto merged
mysql-test/t/count_distinct2.test:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ctype_many.test:
Auto merged
mysql-test/t/ctype_ucs_binlog.test:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/derived.test:
Auto merged
mysql-test/t/distinct.test:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/endspace.test:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
mysql-test/t/fulltext_order_by.test:
Auto merged
mysql-test/t/func_compress.test:
Auto merged
mysql-test/t/func_concat.test:
Auto merged
mysql-test/t/func_date_add.test:
Auto merged
mysql-test/t/func_equal.test:
Auto merged
mysql-test/t/func_if.test:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/t/func_set.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
mysql-test/t/gis-rtree.test:
Auto merged
mysql-test/t/gis.test:
Auto merged
mysql-test/t/grant.test:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/grant_cache.test:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/heap_btree.test:
Auto merged
mysql-test/t/heap_hash.test:
Auto merged
mysql-test/t/init_connect.test:
Auto merged
mysql-test/t/insert_select.test:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
mysql-test/t/key.test:
Auto merged
mysql-test/t/keywords.test:
Auto merged
mysql-test/t/limit.test:
Auto merged
mysql-test/t/lock.test:
Auto merged
mysql-test/t/lowercase_table.test:
Auto merged
mysql-test/t/lowercase_table3.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/mysqlbinlog2.test:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
mysql-test/t/ndb_charset.test:
Auto merged
mysql-test/t/ndb_grant.later:
Auto merged
mysql-test/t/ndb_index_ordered.test:
Auto merged
mysql-test/t/ndb_index_unique.test:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
mysql-test/t/ndb_types.test:
Auto merged
mysql-test/t/ndb_update.test:
Auto merged
mysql-test/t/null.test:
Auto merged
mysql-test/t/null_key.test:
Auto merged
mysql-test/t/olap.test:
Auto merged
mysql-test/t/openssl_1.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/ps_4heap.test:
Auto merged
mysql-test/t/ps_5merge.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/replace.test:
Auto merged
mysql-test/t/row.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl000015.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
mysql-test/t/rpl000018.test:
Auto merged
mysql-test/t/rpl_EE_error.test:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
mysql-test/t/rpl_charset.test:
Auto merged
mysql-test/t/rpl_create_database.test:
Auto merged
mysql-test/t/rpl_ddl.test:
Auto merged
mysql-test/t/rpl_deadlock.test:
Auto merged
mysql-test/t/rpl_empty_master_crash.test:
Auto merged
mysql-test/t/rpl_error_ignored_table.test:
Auto merged
mysql-test/t/rpl_flush_log_loop.test:
Auto merged
mysql-test/t/rpl_flush_tables.test:
Auto merged
mysql-test/t/rpl_get_lock.test:
Auto merged
mysql-test/t/rpl_heap.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_loaddata_rule_m.test:
Auto merged
mysql-test/t/rpl_log.test:
Auto merged
mysql-test/t/rpl_log_pos.test:
Auto merged
mysql-test/t/rpl_max_relay_size.test:
Auto merged
mysql-test/t/rpl_multi_query.test:
Auto merged
mysql-test/t/rpl_openssl.test:
Auto merged
mysql-test/t/rpl_redirect.test:
Auto merged
mysql-test/t/rpl_relayrotate.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/rpl_reset_slave.test:
Auto merged
mysql-test/t/rpl_server_id2.test:
Auto merged
mysql-test/t/rpl_temporary.test:
Auto merged
mysql-test/t/rpl_timezone.test:
Auto merged
mysql-test/t/rpl_user_variables.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysql-test/t/synchronization.test:
Auto merged
mysql-test/t/system_mysql_db.test:
Auto merged
mysql-test/t/system_mysql_db_fix.test:
Auto merged
mysql-test/t/temp_table.test:
Auto merged
mysql-test/t/timezone2.test:
Auto merged
mysql-test/t/timezone_grant.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/type_ranges.test:
Auto merged
mysql-test/t/type_timestamp.test:
Auto merged
mysql-test/t/union.test:
Auto merged
mysql-test/t/update.test:
Auto merged
mysql-test/t/user_var-binlog.test:
Auto merged
mysql-test/t/warnings.test:
Auto merged
mysys/thr_lock.c:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
BitKeeper/deleted/.del-rpl_trunc_binlog.test~961b1f6ac73d37c8:
Simple merge
mysql-test/r/ps_grant.result:
Simple merge
mysql-test/t/analyse.test:
Simple merge
mysql-test/t/auto_increment.test:
Simple merge
mysql-test/t/bdb.test:
Simple merge
mysql-test/t/bigint.test:
Simple merge
mysql-test/t/case.test:
Simple merge
mysql-test/t/cast.test:
Simple merge
mysql-test/t/check.test:
Simple merge
mysql-test/t/count_distinct.test:
Simple merge
mysql-test/t/ctype_latin1_de.test:
Simple merge
mysql-test/t/ctype_uca.test:
Simple merge
mysql-test/t/ctype_ucs.test:
Simple merge
mysql-test/t/ctype_utf8.test:
Simple merge
mysql-test/t/delete.test:
Simple merge
mysql-test/t/flush_block_commit.test:
Simple merge
mysql-test/t/func_default.test:
Simple merge
mysql-test/t/func_gconcat.test:
Simple merge
mysql-test/t/func_group.test:
Aligned code with 4.1
mysql-test/t/func_in.test:
Simple merge
mysql-test/t/func_math.test:
Simple merge
mysql-test/t/func_misc.test:
Simple merge
mysql-test/t/func_test.test:
Simple merge
mysql-test/t/func_time.test:
Simple merge
mysql-test/t/group_by.test:
Simple merge
mysql-test/t/having.test:
Simple merge
mysql-test/t/innodb.test:
Simple merge
mysql-test/t/insert.test:
Simple merge
mysql-test/t/join_outer.test:
Simple merge
mysql-test/t/kill.test:
Simple merge
mysql-test/t/loaddata.test:
Simple merge
mysql-test/t/lock_multi.test:
Simple merge
mysql-test/t/multi_update.test:
Simple merge
mysql-test/t/mysqlbinlog.test:
Simple merge
mysql-test/t/mysqldump.test:
Aligned code with 4.1
mysql-test/t/mysqltest.test:
Simple merge
mysql-test/t/ndb_basic.test:
Simple merge
mysql-test/t/ndb_cache.test:
Simple merge
mysql-test/t/ndb_subquery.test:
Simple merge
mysql-test/t/ps_grant.test:
Simple merge
mysql-test/t/range.test:
Simple merge
mysql-test/t/rpl_drop_temp.test:
Simple merge
mysql-test/t/rpl_loaddata_rule_s.test:
Simple merge
mysql-test/t/rpl_loaddatalocal.test:
Simple merge
mysql-test/t/rpl_rotate_logs.test:
Simple merge
mysql-test/t/rpl_until.test:
Simple merge
mysql-test/t/rpl_variables.test:
Simple merge
mysql-test/t/select.test:
Simple merge
mysql-test/t/sql_mode.test:
Simple merge
mysql-test/t/type_blob.test:
Simple merge
mysql-test/t/type_decimal.test:
Simple merge
mysql-test/t/user_var.test:
Simple merge
mysql-test/t/variables.test:
Simple merge
sql/lock.cc:
Simple optimization
sql/mysql_priv.h:
Simple merge
sql/sql_table.cc:
Simple merge
sql/table.cc:
Simple merge
sql/unireg.cc:
Simple merge
they're not needed outside of the source tree (BUG#12057)
- Removed some more unneeded files from "make install" along the way
scripts/Makefile.am:
- don't install the following files with "make install", as they are
not needed to be installed:
make_win_src_distribution, make_win_binary_distribution,
make_binary_distribution, make_sharedlib_distribution
support-files/MacOSX/Makefile.am:
- don't install the Mac OS X support files when running "make install" -
they're not needed outside of the source tree (BUG#12057)
support-files/Makefile.am:
- don't install the RPM spec files with "make install" - they are not
needed outside of the source tree
mysql user account to that group in the server postinstall section of the RPM spec
file
support-files/mysql.spec.sh:
- manual merge of the fix for BUG#10984: create a "mysql" user group and assign the
mysql user account to that group in the server postinstall section.
- create a "mysql" user group and assign the mysql user account to that group
in the server postinstall section. (BUG 10984)
- backported some changes from the 4.1 RPM spec file (cleanups: removed the incomplete
Brazilian translations, more consequent use of macros)
support-files/mysql.spec.sh:
- create a "mysql" user group and assign the mysql user account to that group
in the server postinstall section. (BUG 10984)
- backported some changes from the 4.1 RPM spec file (cleanups: removed the incomplete
Brazilian translations, more consequent use of macros)
"--with static" or "--define '_with_static 1'" to the RPM build options.
Static linking really only makes sense when linking against the specially patched
glibc 2.2.5.
support-files/mysql.spec.sh:
- Do not build statically on i386 by default, only when adding either "--with
static" or "--define '_with_static 1'" to the RPM build options. Static
linking really only makes sense when linking against the specially patched
glibc 2.2.5.
when doing "make install" (they are not needed/useful) outside the build tree. Added
"mysql_client_test" to the "MySQL-bench" RPM.
- some small RPM spec file improvements (more variables than hard-coded values, cleanups)
scripts/Makefile.am:
- no need to install "make_win_src_distribution" and "make_win_binary_distribution"
in "make install" (BUG#10676)
support-files/mysql.spec.sh:
- added mysql_client_test to the "bench" subpackage (BUG 10676)
- use "mysqldatadir" variable instead of hard-coding the path multiple times
- use the "mysqld_user" variable on all occasions a user name is referenced
- removed (incomplete) Brazilian translations
- removed redundant release tags from the subpackage descriptions
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
Auto merged
VC++Files/client/mysqltest.dsp:
Auto merged
BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
Auto merged
VC++Files/strings/strings.dsp:
Auto merged
VC++Files/strings/strings_ia64.dsp:
Auto merged
include/config-win.h:
Auto merged
myisammrg/myrg_open.c:
Auto merged
mysys/my_getwd.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
configure.in:
- manual merge, fixed NDB_VERSION_BUILD
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
spec file)
BitKeeper/deleted/.del-mysql-max.spec.sh~ca055d86585c1010:
Delete: support-files/mysql-max.spec.sh
configure.in:
- removed references to some obsolete files
scripts/make_binary_distribution.sh:
- removed references to some obsolete files
client/mysqldump.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/item.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
support-files/mysql.spec.sh:
Auto merged
client/client_priv.h:
Manual merge (still to be corrected!)
(bug#10674, bug#10681)
support-files/mysql.spec.sh:
Added a missing "make clean" which had caused the original 4.1.12 RPMs to be broken.
(bug#10674, bug#10681)
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Initial Metrowerks CodeWarrior compiler support
new file
support-files/MacOSX/mwar-wrapper:
Initial Metrowerks CodeWarrior compiler support
BUILD/compile-darwin-mwcc:
Initial Metrowerks CodeWarrior compiler support
support-files/MacOSX/mwcc-wrapper:
Initial Metrowerks CodeWarrior compiler support
Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux
(e.g. RHEL3/RHEL4)
support-files/mysql.server.sh:
- adjusted the start and stop priority level for chkconfig on Red Hat Linux (BUG#9444) - we now match
the levels used by the MySQL as shipped with Red Hat Linux (RHEL3/RHEL4)
Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf)
Search first for defaults files in basedir and then in datadir (like mysqld_safe)
support-files/mysql.server.sh:
Set bindir, datadir & others if --basedir is given. This ensures that one only has to set basedir in [mysqld] group when moving a binary installation to a not default polace
Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf)
Search first for defaults files in basedir and then in datadir (like mysqld_safe)
I removed the test for localstatedir as default.c doesn't anymore read defaults files from localstatedir
mysql-test/t/range.test:
Added more rows to test to get predictable results
(if it still fails, we need to add even more rows)
scripts/make_binary_distribution.sh:
Apply Jims patch for mysql.server
support-files/mysql.server.sh:
Apply Jims patch to support mysqld_safe
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/set_var.cc:
Auto merged
support-files/mysql.server.sh:
Auto merged
sql/ha_ndbcluster.cc:
Merge
sql/handler.cc:
Merge
sql/handler.h:
Merge
sql/mysqld.cc:
Merge
for LSB init functions when they aren't available. (Bug #9852)
support-files/mysql.server.sh:
Use shell function instead of less portable alias command
to create replacements for LSB functions, and also use
argument in our replacements.
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
- Added a stub scripts/fill_help_tables.sql file to satisfy the build dependencies
- Removed scripts/fill_help_tables.sh and updated scripts/Makefile.am accordingly
The fill_help_tables.sql stub will be replaced with the approriate content when building the
official source distribution via Bootstrap - it's now autogenerated on the documentation server
and will be copied into place before packing up the source distribution.
scripts/Makefile.am:
- removed fill_help_tables.sh and the creation of fill_help_tables.sql from the Makefile
(fill_help_tables.sql is now generated on the documentation server and will be added to
the offical source distribution during the Bootstrap
support-files/mysql.spec.sh:
- fixed a typo
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
doesn't work out of the box)
client/Makefile.am:
old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into mysqltestmanager, mysqltestmanagerc and
mysqltestmanager-pwgen respectively
mysql-test/mysql-test-run.sh:
Old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into
mysqltestmanager, mysqltestmanagerc and mysqltestmanager-pwgen respectively
scripts/make_binary_distribution.sh:
Fix the script to include IM and process mysql.server correctly
server-tools/instance-manager/Makefile.am:
change default socket name to follow mysqld style (and thus, fix the ptoblem with non-existant localstatedir
in the binary distribution)
support-files/mysql.spec.sh:
Fix mysql.spec template to reflect the name change
tools/Makefile.am:
old mysqlmanager renamed into mysqltestmanager
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
wait_for_pid function is fixed to wait for pid removal in "stop".
recomitted with post-review fix
support-files/mysql.server.sh:
wait_for_pid function corrected to work properly with start/stop
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/metadata.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/union.test:
Auto merged
sql/item.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
support-files/mysql.server.sh:
Auto merged
support-files/mysql.server.sh:
Replace a non-portable "for" loop (bash style, fails on BSD) by an equivalent "while" loop.
Note that the "stop" method is still wrong, as it does not wait for file removal.
Alter RPM to include mysqlmanger binary and config files.
support-files/mysql.server.sh:
mysql start/stop script altered to use mysqlmanager instead of mysqld_safe, novel 'reload' option
was temporarily removed
support-files/mysql.spec.sh:
correct RPM to include mysqlmanager
in the 4.1.10a RPMs for SLES9/RHEL3:
- small improvement: use LSB functions to display startup success and failure, if available.
Fall back to more primitive builtin functions otherwise.
- joined two pieces of code performing the same functionality into one "wait_for_pid" function
- added a "reload" function (LSB requirement)
support-files/mysql.server.sh:
- small improvement: use LSB functions to display startup success and failure, if available.
Fall back to builtin functions otherwise.
- joined two pieces of code performing the same functionality into one "wait_for_pid" function
- added a "reload" function (LSB requirement)
removed typo
moved pre to post for directory creation
add changelog comments
support-files/mysql.spec.sh:
removed typo
moved pre to post for directory creation
add changelog comments
source RPM): use "mysqladmin ping" instead of grepping the process list
for the mysqld binary (should be more portable than relying on the "ps"
options
support-files/mysql-log-rotate.sh:
- small improvement (patch found in the SUSE source RPM): use "mysqladmin ping"
instead of grepping the process list for the mysqld binary (should be more
portable than relying on the "ps" options
BitKeeper/etc/ignore:
auto-union
Build-tools/Do-compile:
Auto merged
configure.in:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/os/os0file.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_latin1_de.result:
Auto merged
mysql-test/r/ctype_tis620.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_ujis.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/type_float.result.es:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-czech.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-mb.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
sql/sql_show.cc:
No changes
strings/ctype-cp932.c:
No changes
support-files/mysql.spec.sh:
No changes
BitKeeper/etc/ignore:
auto-union
Build-tools/Do-compile:
Auto merged
client/mysqladmin.cc:
Auto merged
heap/hp_create.c:
Auto merged
heap/hp_write.c:
Auto merged
include/my_sys.h:
Auto merged
innobase/data/data0type.c:
Auto merged
innobase/include/row0mysql.h:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/r/ctype_latin1_de.result:
Auto merged
mysql-test/r/ctype_tis620.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/ctype_ujis.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/type_float.result.es:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/r/type_timestamp.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/type_timestamp.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
ndb/src/kernel/vm/Configuration.cpp:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-czech.c:
Auto merged
strings/ctype-gbk.c:
Auto merged
strings/ctype-latin1.c:
Auto merged
strings/ctype-mb.c:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-sjis.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/ctype-uca.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
configure.in:
Use local values
mysql-test/r/ps_1general.result:
Update results
mysql-test/t/func_gconcat.test:
no changes
mysql-test/t/ps_1general.test:
Use local code
ndb/src/common/util/version.c:
Use local code
sql/filesort.cc:
Empty line changes
sql/ha_heap.cc:
Merge
sql/item_timefunc.cc:
Keep local code
sql/mysql_priv.h:
Update to 5.0
sql/sql_show.cc:
Hand merge
support-files/mysql.spec.sh:
No changes
Federated Storage Engine (as requested by Brian)
- added the federated storage engine to the Max Linux RPM
Build-tools/Do-compile:
- added option "--with-federated" to enable building of the Federated
Storage Engine (as requested by Brian)
support-files/mysql.spec.sh:
- enabled the federated storage engine for the Max RPM subpackage
or by using --log-bin-index). This is so that he does not have a replication break when his master's
hostname changes. Plus binary logging options consistency checks.
sql/mysqld.cc:
* Encourage user to specify a name for the binlog index file (either by giving an argument to --log-bin,
or by using --log-bin-index). This is so that he does not have a replication break when his master's
hostname changes. Why not a fatal error? To not break existing many-machine setups.
* --log-bin-index without --log-bin does not make sense.
* --log-slave-updates without --log-bin does not either.
support-files/my-huge.cnf.sh:
encourage providing an argument to log-bin
support-files/my-innodb-heavy-4G.cnf.sh:
encourage providing an argument to log-bin
support-files/my-large.cnf.sh:
encourage providing an argument to log-bin
support-files/my-medium.cnf.sh:
encourage providing an argument to log-bin
support-files/my-small.cnf.sh:
encourage providing an argument to log-bin
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Makefile.am:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
innobase/log/log0recv.c:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/drop.result:
Auto merged
mysql-test/r/func_time.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/ps_7ndb.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/drop.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
ndb/include/ndb_global.h.in:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/time.cc:
Auto merged
innobase/row/row0upd.c:
Trivial merge
mysql-test/t/func_concat.test:
Keep local code
mysql-test/t/multi_update.test:
auto merge
sql/ha_ndbcluster.cc:
manual merge
sql/item_timefunc.cc:
manual merge
sql/mysql_priv.h:
manual merge
sql/sql_class.h:
manual merge
sql/sql_delete.cc:
manual merge
sql/sql_insert.cc:
manual merge
sql/sql_lex.cc:
manual merge
sql/sql_lex.h:
manual merge
sql/sql_load.cc:
manual merge
sql/sql_parse.cc:
manual merge
sql/sql_table.cc:
manual merge
sql/sql_update.cc:
manual merge
Removed references to ISAM and MERGE
netware/BUILD/compile-linux-tools:
Removed references to ISAM and MERGE
netware/Makefile.am:
Removed references to ISAM and MERGE
os2/ChangeLog.os2:
Removed references to ISAM and MERGE
os2/MySQL-Source.icc:
Removed references to ISAM and MERGE
os2/MySQL-Sql.icc:
Removed references to ISAM and MERGE
os2/MySQL-Util.icc:
Removed references to ISAM and MERGE
support-files/debian/gomi:
Removed references to ISAM and MERGE
I fixed the typos in the transaction-isolation comments.
I fixed the spelling mistakes in the comment. It had tripped up a support
customer as they couldn't start the server with transaction-isolation=
read-commited
support-files/my-innodb-heavy-4G.cnf.sh:
I fixed the typos in the transaction-isolation comments.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
BitKeeper/etc/logging_ok:
auto-union
VC++Files/sql/mysqld.dsp:
Auto merged
client/mysql.cc:
Auto merged
client/mysqladmin.c:
Auto merged
BitKeeper/deleted/.del-mysql_install.c~8c089740d79a92:
Auto merged
client/mysqlbinlog.cc:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlmanager-pwgen.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/my_print_defaults.c:
Auto merged
extra/perror.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
extra/resolveip.c:
Auto merged
include/my_getopt.h:
Auto merged
innobase/buf/buf0rea.c:
Auto merged
isam/isamchk.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
tools/mysqlmanager.c:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/binary.result:
Auto merged
mysql-test/r/truncate.result:
Auto merged
mysql-test/t/binary.test:
Auto merged
mysql-test/t/truncate.test:
Auto merged
mysys/my_lib.c:
Auto merged
strings/my_vsnprintf.c:
Auto merged
support-files/Makefile.am:
Auto merged
modifying configure.in for the commercial tarballs
- added my-innodb-heavy-4G.cnf to the distribution
Build-tools/mysql-copyright:
- make sure to recreate all autoconf/automake-related files after
modifying configure.in
support-files/Makefile.am:
- added my-innodb-heavy-4G.cnf to the distribution
static linking against an unpatched glibc 2.3 is causing trouble
- add "glibc23" to the release suffix in this case
- re-ordered the Changelog that was messed up by a BK merge
(RPM is picky about this)
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
