Removed Visual Studio 6 project files, as they are not maintained
scripts/make_win_src_distribution.sh:
Removed Visual Studio 6 project files, as they are not maintained
- split into several files
- forbid parallel execution (before analyse is done how to make it possible)
because the same sp_head instance cannot be executed in parallel
- added GPL headers
- changed EVENT_ACL to be per DB variable
- fixed minor problems
mysql-test/lib/init_db.sql:
WL#1034 updated
- add Event_priv to mysql.user (update test)
- add updated mysql.event table struct
scripts/mysql_fix_privilege_tables.sql:
WL#1034 updated
add updated mysql.event structure
sql/Makefile.am:
split event.cc into
- event.cc (create/alter/drop)
- event_executor.cc (main and worker threads)
- event_timed.cc (class event_timed)
- event_priv.h (some definitions used internally by the module)
sql/event.cc:
- added GPL header
- split into few files
- fixed some issues after code review
- now using SP routines for opening/traversing/closing tables
(will be reverted)
sql/event.h:
- add GPL header
- remove two methods - inline them in sql_yacc.yy
- don't use absolute values for EVEX_ defines but the SP_ equivalents (have to move 100% to SP_
defines and as later step to not transfer messages upwards in the stack but
report them at the place they occur)
- updated reference table definition
- move default mem_root param from event.cc to the header
sql/mysqld.cc:
WL#1034
rename --event-executor to --event-scheduler
executor sounds a bit scary :)
sql/set_var.cc:
rename internal variable name from event_executor to event_scheduler
(ppl won't be scarried anymore :)
sql/share/errmsg.txt:
omit one %s - not needed
sql/sp_head.cc:
disable this DBUG_PRINT for a bit. m_next_cached_sp is 0x0 and I get crash here...
sql/sp_head.h:
remove m_old_cmq, a temporal variable is used in sql_yacc.yy (Serg's idea)
to keep the previous state.
$<ulong_val>$ = ....
YYTHD->client_capabilites != $<ulong_val>4;
(the same is done also for class event_timed)
sql/sql_acl.cc:
handle pre-5.1.4 table and give the user EVENT_ACL if he had CREATE_ACL
sql/sql_acl.h:
fix the bitmask
sql/sql_parse.cc:
- move from EVENT_ACL being global to EVENT_ACL being per DB like
CREATE_PROC_ACL
- lex->m_qname dropped, because not needed, fix code therefore
- add comment that SHOW CREATE EVENT has to be implemented
sql/sql_yacc.yy:
- use temporal variable of Bison to store a short lived value
- fix indentation
- inline 2 class event_timed methods in the parser
sql/tztime.h:
be more expressive - it's already extern
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
Makefile.am:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
extra/Makefile.am:
Auto merged
include/Makefile.am:
Auto merged
include/my_global.h:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
scripts/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_federated.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/key.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/structs.h:
Auto merged
sql/table.cc:
Auto merged
sql/tztime.cc:
Auto merged
storage/myisam/myisamchk.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/ndb/docs/Makefile.am:
Auto merged
support-files/mysql.spec.sh:
Auto merged
libmysqld/Makefile.am:
Merged from 5.0 to 5.1.
sql/ha_berkeley.cc:
Merged from 5.0 to 5.1.
sql/lex.h:
Merged from 5.0 to 5.1.
sql/set_var.cc:
Merged from 5.0 to 5.1.
sql/share/errmsg.txt:
Merged from 5.0 to 5.1.
sql/sql_lex.h:
Merged from 5.0 to 5.1.
sql/sql_show.cc:
Merged from 5.0 to 5.1.
sql/sql_yacc.yy:
Merged from 5.0 to 5.1.
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
BitKeeper/etc/ignore:
auto-union
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/view.test:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.h:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
configure.in:
merge
mysql-test/r/ps_1general.result:
merge ("ul", will fix)
sql/examples/ha_tina.cc:
merge
sql/ha_innodb.cc:
merge
sql/handler.h:
merge
sql/log.cc:
merge
sql/set_var.cc:
merge
sql/share/errmsg.txt:
merge (bad, will fix)
sql/sql_show.cc:
merge (bad, will fix)
sql/sql_yacc.yy:
merge
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
merge
Adapt to the directory hierarchy change in 5.1, "ndb" -> "storage/ndb".
scripts/make_binary_distribution.sh:
Adapt to the directory hierarchy change in 5.1, "ndb" -> "storage/ndb".
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
include/ft_global.h:
Default parser added.
include/my_global.h:
dlopen related code moved from sql_udf.cc into my_global.h
include/myisam.h:
Added fulltext parser to MI_KEYDEF
libmysqld/Makefile.am:
Added LIBDIR macro.
mysql-test/r/connect.result:
Test result fixed: added plugin table
mysql-test/r/information_schema.result:
Test result fixed: added plugin table.
mysql-test/r/mysqlcheck.result:
Test result fixed: added plugin table.
mysql-test/r/system_mysql_db.result:
Test fixed: added plugin table
mysql-test/t/system_mysql_db_fix.test:
Test fixed: added plugin table
scripts/mysql_create_system_tables.sh:
Added mysql.plugin table.
scripts/mysql_fix_privilege_tables.sql:
Added mysql.plugin table.
sql/Makefile.am:
Added LIBDIR macro.
sql/ha_myisam.cc:
Pass fulltext parser from sql to myisam layer.
sql/lex.h:
Plugin related symbols.
sql/mysqld.cc:
Initialize/deinitialize plugins, pass opt_plugin_dir.
plugin-dir renamed to plugin_dir.
plugin_dir is relative to mysql_home now.
sql/set_var.cc:
plugin_dir added to SHOW VARIABLES.
sql/share/errmsg.txt:
Plugin related error messages.
sql/sql_class.h:
Added parser to Key class.
Hold parser_name instead of plugin in Key class.
sql/sql_lex.h:
INSTALL/UNINSTALL PLUGIN commands.
sql/sql_parse.cc:
INSTALL/UNINSTALL PLUGIN commands.
sql/sql_show.cc:
SHOW CREATE TABLE: output parser name if index was created WITH PARSER.
sql/sql_table.cc:
Pass fulltext parser from yacc to sql layer.
sql/sql_udf.cc:
dlopen related code moved into my_global.h.
Implemented better check for UDF path.
UDF loads libraries that are under plugin_dir now.
sql/sql_yacc.yy:
INSTALL/UNINSTALL PLUGIN syntax.
Added WITH PARSER syntax to CREATE/ALTER TABLE/INDEX.
opt_fulltext_parser must allocate memory, since it will be used afterwards.
sql/table.cc:
Save/restore fulltext parser in extra data segment.
Added DBUG_PRINTs.
storage/myisam/ft_boolean_search.c:
Split functions so they can be used by fulltext parser.
Use fulltext parser if specified.
storage/myisam/ft_nlq_search.c:
Use fulltext parser.
storage/myisam/ft_parser.c:
Split functions so they can be used by fulltext parser.
Use fulltext parser if specified.
storage/myisam/ft_static.c:
Default fulltext parser added.
storage/myisam/ft_update.c:
Use fulltext parser.
storage/myisam/ftdefs.h:
FTB_PARAM moved into plugin.h and renamed to MYSQL_FTPARSER_BOOLEAN_INFO.
storage/myisam/mi_open.c:
Set default parser.
into mysql.com:/home/my/mysql-5.1
BUILD/FINISH.sh:
Auto merged
BitKeeper/deleted/.del-makefilewin.i~5c8479dcb8a455b2:
Auto merged
BitKeeper/deleted/.del-makefilewin~13888739357b3025:
Auto merged
BitKeeper/deleted/.del-makefilewin~14f24a4a173e2fcd:
Auto merged
BitKeeper/deleted/.del-makefilewin~15e9e5c9e8fa870b:
Auto merged
BitKeeper/deleted/.del-makefilewin~1c53f31b88dd36e:
Auto merged
BitKeeper/deleted/.del-makefilewin~1dbc058d76ebf1db:
Auto merged
BitKeeper/deleted/.del-makefilewin~2e0407fe123f8365:
Auto merged
BitKeeper/deleted/.del-makefilewin~2fc379bd4065c995:
Auto merged
BitKeeper/deleted/.del-makefilewin~389ee2dcf79afb79:
Auto merged
BitKeeper/deleted/.del-makefilewin~4d139e182457e553:
Auto merged
BitKeeper/deleted/.del-makefilewin~5104767c73775697:
Auto merged
BitKeeper/deleted/.del-makefilewin~608ed49dcd88e0f7:
Auto merged
BitKeeper/deleted/.del-makefilewin~63acd666293282a:
Auto merged
BitKeeper/deleted/.del-makefilewin~6ba64863bce3d0b8:
Auto merged
BitKeeper/deleted/.del-makefilewin~72a64128bacce71b:
Auto merged
BitKeeper/deleted/.del-makefilewin~78000390c783b1c5:
Auto merged
BitKeeper/deleted/.del-makefilewin~7a9d7d5a42bbfaf5:
Auto merged
Makefile.am:
Auto merged
BitKeeper/deleted/.del-makefilewin~a40ea12eebdd6ef0:
Auto merged
BitKeeper/deleted/.del-makefilewin~aeea7c82f21f7cf5:
Auto merged
BitKeeper/deleted/.del-makefilewin~b643e38d8da389ac:
Auto merged
BitKeeper/deleted/.del-makefilewin~c7b621c745e5de95:
Auto merged
BitKeeper/deleted/.del-makefilewin~c8273a47b90f52bb:
Auto merged
BitKeeper/deleted/.del-makefilewin~d1a9d1f7d33fcb73:
Auto merged
BitKeeper/deleted/.del-makefilewin~d37b6b303348c871:
Auto merged
BitKeeper/deleted/.del-makefilewin~d90f35fdc3f2ee5f:
Auto merged
BitKeeper/deleted/.del-makefilewin~dc4b8ad5ea53bd:
Auto merged
BitKeeper/deleted/.del-makefilewin~dea10ec1c94f7be:
Auto merged
BitKeeper/deleted/.del-makefilewin~ef3a208fa0e9b0db:
Auto merged
BitKeeper/deleted/.del-makefilewin~f1e3b890aa1c9ea3:
Auto merged
BitKeeper/deleted/.del-makefilewin~f4b7b99a887b7de:
Auto merged
BitKeeper/deleted/.del-makefilewin~fdda94ad32fa9e34:
Auto merged
BitKeeper/deleted/.del-my_cnf~977f69858affc57b:
Auto merged
BitKeeper/etc/config:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
client/mysqltest.c:
Auto merged
include/Makefile.am:
Auto merged
include/base64.h:
Auto merged
include/my_base.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/r/ndb_condition_pushdown.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysys/Makefile.am:
Auto merged
mysys/base64.c:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
storage/heap/_check.c:
Auto merged
storage/heap/hp_create.c:
Auto merged
storage/innobase/include/Makefile.am:
Auto merged
storage/innobase/include/rem0rec.h:
Auto merged
storage/innobase/include/rem0rec.ic:
Auto merged
storage/innobase/row/row0ins.c:
Auto merged
storage/innobase/row/row0upd.c:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
storage/myisam/mi_rnext_same.c:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisamchk.c:
Auto merged
storage/myisam/myisamdef.h:
Auto merged
storage/myisam/sort.c:
Auto merged
storage/myisammrg/myrg_queue.c:
Auto merged
storage/ndb/config/type_util.mk.am:
Auto merged
storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/include/mgmapi/ndbd_exit_codes.h:
Auto merged
storage/ndb/include/transporter/TransporterCallback.hpp:
Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.cpp:
Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp:
Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp:
Auto merged
storage/ndb/src/common/transporter/Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/common/util/Makefile.am:
Auto merged
storage/ndb/src/common/util/Parser.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
Auto merged
storage/ndb/src/kernel/vm/FastScheduler.cpp:
Auto merged
storage/ndb/src/kernel/vm/TransporterCallback.cpp:
Auto merged
storage/ndb/src/kernel/vm/VMSignal.hpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
Auto merged
storage/ndb/test/ndbapi/testOperations.cpp:
Auto merged
storage/ndb/test/src/HugoCalculator.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
support-files/mysql.spec.sh:
Auto merged
BUILD/SETUP.sh:
manual merge
configure.in:
manual merge
mysql-test/r/alter_table.result:
manual merge
sql/handler.cc:
manual merge
sql/mysql_priv.h:
manual merge
sql/records.cc:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sql_table.cc:
manual merge
Fix labels
sql/sql_update.cc:
manual merge
sql/table.cc:
manual merge
sql/unireg.cc:
manual merge
storage/ndb/config/type_ndbapi.mk.am:
manual merge
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
even when --ledir option is specified. (Bug #13774)
scripts/mysqld_safe.sh:
Figure out whether to use mysqld or mysqld-max after we have handled
the command-line options and .cnf files.
Add explicit Thread_info::Thread_info() and move both
initializers out of class definition, to solve link
problem on QNX
Makefile.am:
Preserve executable mode on scripts
make_binary_distribution.sh:
Copy *.imtest files
scripts/make_binary_distribution.sh:
Copy *.imtest files
mysql-test/Makefile.am:
Preserve executable mode on scripts
server-tools/instance-manager/thread_registry.cc:
Add explicit Thread_info::Thread_info() and move both
initializers out of class definition, to solve link
problem on QNX
server-tools/instance-manager/thread_registry.h:
Add explicit Thread_info::Thread_info() and move both
initializers out of class definition, to solve link
problem on QNX
into mysql.com:/usr/home/bar/mysql-5.0.b9278
mysql-test/t/cast.test:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/select.result:
Auto merged
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
configure.in:
Auto merged
include/config-win.h:
Auto merged
include/m_string.h:
Auto merged
include/my_pthread.h:
Auto merged
myisam/mi_search.c:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_alarm.c:
Auto merged
netware/pack_isam.def:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-tis620.c:
Auto merged
strings/xml.c:
Auto merged
vio/vio.c:
Auto merged
vio/viosocket.c:
Auto merged
mysql-test/r/select.result:
Merged from 4.1.
netware/BUILD/mwenv:
Merged from 4.1.
scripts/make_binary_distribution.sh:
Merged from 4.1.
sql/mysqld.cc:
Merged from 4.1.
sql/sql_show.cc:
Merged from 4.1.
strings/my_strtoll10.c:
Merged from 4.1.
netware/BUILD/mwenv:
Removed -O3 for Metrowerks compiler.
netware/pack_isam.def:
NetWare specific change, Added SCRENNAME for pack_isam.
scripts/make_binary_distribution.sh:
Netware specific change for creating help tables.
strings/my_strtoll10.c:
Fix for Metrowerks compiler.
into mysql.com:/usr/home/bar/mysql-5.0.b9278
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/cast.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/cast.test:
Auto merged
mysql-test/t/federated.test:
Auto merged
scripts/make_win_src_distribution.sh:
- added Docs/manual.chm to the windows source distribution (BUG#13899). The file
is placed in there by the Bootstrap script, which pulls it from the mysqldoc
repository
into mysql.com:/users/lthalmann/bk/mysql-5.0
myisam/mi_rkey.c:
Auto merged
mysql-test/r/subselect2.result:
Auto merged
mysql-test/t/select.test:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
configure.in:
After merge fixes
myisam/mi_search.c:
After merge fixes
mysql-test/r/select.result:
After merge fixes
sql/item.cc:
After merge fixes
sql/sql_parse.cc:
After merge fixes
sql/sql_update.cc:
After merge fixes
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/myisam/ft_nlq_search.c:
Auto merged
storage/myisam/myisamdef.h:
Auto merged
storage/myisam/sort.c:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
Corrected platform name output
Services.cpp:
Dont print null address (back port from 5.0)
ndb/src/mgmsrv/Services.cpp:
Dont print null address (back port from 5.0)
scripts/make_binary_distribution.sh:
Corrected platform name output
Reintroduced --machine
Better sh compatibility, "for i ; do" is not portable
scripts/make_binary_distribution.sh:
Reintroduced --machine
Better sh compatibility, "for i ; do" is not portable
BitKeeper/etc/ignore:
auto-union
BUILD/autorun.sh:
Auto merged
BitKeeper/deleted/.del-bdb.vcproj~ed8534936e40cefb:
Auto merged
BitKeeper/deleted/.del-heap.vcproj~70c0cc1d680a51c1:
Auto merged
BitKeeper/deleted/.del-innobase.vcproj~71e1de81f11138bf:
Auto merged
BitKeeper/deleted/.del-myisam.vcproj~32bb9e4a163fcb5a:
Auto merged
BitKeeper/deleted/.del-myisammrg.vcproj~6534e59acbfbb63:
Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~703886a28862bb2:
Auto merged
Makefile.am:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/mysql_com.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysys/default.c:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_federated.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_myisammrg.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/unireg.cc:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/buf/buf0flu.c:
Auto merged
storage/innobase/data/data0data.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/include/btr0btr.h:
Auto merged
storage/innobase/include/data0type.ic:
Auto merged
storage/innobase/include/dict0dict.h:
Auto merged
storage/innobase/include/dict0mem.h:
Auto merged
storage/innobase/include/mem0mem.h:
Auto merged
storage/innobase/include/mem0mem.ic:
Auto merged
storage/innobase/include/os0file.h:
Auto merged
storage/innobase/include/row0mysql.h:
Auto merged
storage/innobase/include/trx0trx.h:
Auto merged
storage/innobase/include/ut0mem.h:
Auto merged
storage/innobase/mem/mem0mem.c:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/os/os0proc.c:
Auto merged
storage/innobase/rem/rem0rec.c:
Auto merged
storage/innobase/row/row0ins.c:
Auto merged
storage/innobase/row/row0mysql.c:
Auto merged
storage/innobase/srv/srv0start.c:
Auto merged
storage/innobase/trx/trx0sys.c:
Auto merged
storage/innobase/trx/trx0trx.c:
Auto merged
storage/innobase/ut/ut0mem.c:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_dbug.c:
Auto merged
storage/myisam/mi_delete.c:
Auto merged
storage/myisam/mi_delete_all.c:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisam/mi_rkey.c:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/myisam/mi_test1.c:
Auto merged
storage/myisam/mi_update.c:
Auto merged
storage/myisam/mi_write.c:
Auto merged
storage/myisam/myisamchk.c:
Auto merged
storage/myisam/myisamdef.h:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisam/sp_key.c:
Auto merged
storage/myisammrg/myrg_rkey.c:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/kernel/signaldata/ApiVersion.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/EventReport.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/StopReq.hpp:
Auto merged
storage/ndb/include/mgmapi/ndb_logevent.h:
Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbIndexOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbRecAttr.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/Config.cpp:
Auto merged
storage/ndb/src/mgmsrv/Config.hpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
storage/ndb/src/mgmsrv/InitConfigFileParser.hpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbApiSignal.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbUtil.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbUtil.hpp:
Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
Auto merged
storage/ndb/src/ndbapi/ObjectMap.hpp:
Auto merged
storage/ndb/test/include/NDBT_Test.hpp:
Auto merged
storage/ndb/test/ndbapi/bank/BankLoad.cpp:
Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
storage/ndb/test/src/HugoCalculator.cpp:
Auto merged
storage/ndb/test/src/NDBT_Test.cpp:
Auto merged
storage/ndb/test/src/NdbBackup.cpp:
Auto merged
storage/ndb/test/src/NdbRestarts.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
configure.in:
merge
BUILD/SETUP.sh:
merge
BitKeeper/deleted/.del-mysql.sln~f2120278f8a437be:
SCCS merged
libmysqld/Makefile.am:
merge
sql/ha_ndbcluster.cc:
merge
sql/handler.h:
merge
sql/mysqld.cc:
merge
sql/opt_range.cc:
merge
sql/slave.cc:
merge
sql/slave.h:
e
merge
sql/sql_parse.cc:
merge
sql/table.cc:
merge
sql/examples/ha_tina.cc:
merge
sql/examples/ha_tina.h:
merge
sql/share/errmsg.txt:
merge
storage/ndb/include/ndbapi/Ndb.hpp:
merge
storage/ndb/src/common/debugger/EventLogger.cpp:
merge
storage/ndb/src/kernel/blocks/dbdict/Makefile.am:
merge
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
merge
storage/ndb/src/ndbapi/Ndbinit.cpp:
SCCS merged
New VC7 project files
des_key_file.cc:
Visual C++ wants '"' for local include
mysql.cc:
Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
Added to convince VS .Net generate a lib for mysqlserver
VC++Files/mysqlserver/dummy.cpp:
Added to convince VS .Net generate a lib for mysqlserver
VC++Files/bdb/bdb.vcproj:
New VC7 project files
VC++Files/client/mysql.vcproj:
New VC7 project files
VC++Files/client/mysqladmin.vcproj:
New VC7 project files
VC++Files/client/mysqlclient.vcproj:
New VC7 project files
VC++Files/client/mysqldump.vcproj:
New VC7 project files
VC++Files/client/mysqlimport.vcproj:
New VC7 project files
VC++Files/client/mysqlshow.vcproj:
New VC7 project files
VC++Files/client/mysqltest.vcproj:
New VC7 project files
VC++Files/comp_err/comp_err.vcproj:
New VC7 project files
VC++Files/dbug/dbug.vcproj:
New VC7 project files
VC++Files/heap/heap.vcproj:
New VC7 project files
VC++Files/innobase/innobase.vcproj:
New VC7 project files
VC++Files/libmysql/libmysql.vcproj:
New VC7 project files
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
New VC7 project files
VC++Files/libmysqld/libmysqld.vcproj:
New VC7 project files
VC++Files/libmysqltest/myTest.vcproj:
New VC7 project files
VC++Files/my_print_defaults/my_print_defaults.vcproj:
New VC7 project files
VC++Files/myisam/myisam.vcproj:
New VC7 project files
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
New VC7 project files
VC++Files/myisamchk/myisamchk.vcproj:
New VC7 project files
VC++Files/myisamlog/myisamlog.vcproj:
New VC7 project files
VC++Files/myisammrg/myisammrg.vcproj:
New VC7 project files
VC++Files/myisampack/myisampack.vcproj:
New VC7 project files
VC++Files/mysql-test/mysql_test_run_new.vcproj:
New VC7 project files
VC++Files/mysql.sln:
New VC7 project files
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
New VC7 project files
VC++Files/mysqlcheck/mysqlcheck.vcproj:
New VC7 project files
VC++Files/mysqldemb/mysqldemb.vcproj:
New VC7 project files
VC++Files/mysqlserver/mysqlserver.vcproj:
New VC7 project files
VC++Files/mysys/mysys.vcproj:
New VC7 project files
VC++Files/perror/perror.vcproj:
New VC7 project files
VC++Files/regex/regex.vcproj:
New VC7 project files
VC++Files/replace/replace.vcproj:
New VC7 project files
VC++Files/sql/mysqld.vcproj:
New VC7 project files
VC++Files/strings/strings.vcproj:
New VC7 project files
VC++Files/test1/test1.vcproj:
New VC7 project files
VC++Files/tests/mysql_client_test.vcproj:
New VC7 project files
VC++Files/thr_test/thr_test.vcproj:
New VC7 project files
VC++Files/vio/vio.vcproj:
New VC7 project files
VC++Files/zlib/zlib.vcproj:
New VC7 project files
client/mysql.cc:
Cast my_cgets() argument for VC6 and VC7
sql/des_key_file.cc:
Visual C++ wants '"' for local include
scripts/make_win_src_distribution.sh:
New VC7 project files
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
BitKeeper/deleted/.del-disabled.def:
Delete: mysql-test/t/disabled.def
libmysqld/lib_sql.cc:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
mysql-test/r/innodb.result:
Manual merge from 4.1 to 5.0
mysql-test/r/select.result:
Manual merge from 4.1 to 5.0
mysql-test/t/select.test:
Manual merge from 4.1 to 5.0
sql/item.cc:
Manual merge from 4.1 to 5.0
Enable "make distcheck" to work
configure.in:
Enable "make distcheck" to work
Docs/Makefile.am:
Enable "make distcheck" to work
Makefile.am:
Enable "make distcheck" to work
client/Makefile.am:
Enable "make distcheck" to work
cmd-line-utils/libedit/Makefile.am:
Enable "make distcheck" to work
include/Makefile.am:
Enable "make distcheck" to work
libmysql/Makefile.am:
Enable "make distcheck" to work
libmysql_r/Makefile.am:
Enable "make distcheck" to work
libmysqld/Makefile.am:
Enable "make distcheck" to work
libmysqld/examples/Makefile.am:
Enable "make distcheck" to work
mysql-test/Makefile.am:
Enable "make distcheck" to work
ndb/docs/Makefile.am:
Enable "make distcheck" to work
netware/Makefile.am:
Enable "make distcheck" to work
pstack/Makefile.am:
Enable "make distcheck" to work
scripts/Makefile.am:
Enable "make distcheck" to work
sql-bench/Makefile.am:
Enable "make distcheck" to work
sql/Makefile.am:
Enable "make distcheck" to work
sql/share/Makefile.am:
Enable "make distcheck" to work
support-files/Makefile.am:
Enable "make distcheck" to work
Revert to shell test script for test targets
mysqltest.c:
Windows pclose() returns error code in low byte
mysql_config.sh:
Remove -Xa -xstrconst from --cflags for Sun C++
scripts/mysql_config.sh:
Remove -Xa -xstrconst from --cflags for Sun C++
client/mysqltest.c:
Windows pclose() returns error code in low byte
Makefile.am:
Revert to shell test script for test targets
into neptunus.(none):/home/msvensson/mysql/bug10713_new/my51-bug10713_new
mysql-test/mysql-test-run.sh:
Auto merged
sql/field.h:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_federated.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/tztime.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/ndb/src/ndbapi/SignalSender.cpp:
Auto merged
VC++Files/mysql.sln:
Manual merge 5.0 -> 5.1
scripts/make_win_src_distribution.sh:
Manual merge 5.0 -> 5.1
sql/field.cc:
Manual merge 5.0 -> 5.1
VC++Files/mysql.sln:
Added instance manager project
VC++Files/mysys/mysys.vcproj:
Added mf_unixpath.c
scripts/make_win_src_distribution.sh:
Updated to include server-tools folder (which includes IM)
server-tools/instance-manager/instance.cc:
fixed typo
server-tools/instance-manager/mysqlmanager.vcproj:
fixed up all the filenames in the IM project
Makefile.am:
Auto merged
BitKeeper/etc/config:
Auto merged
scripts/Makefile.am:
Auto merged
sql/ha_federated.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.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/table.cc:
Auto merged
sql/table.h:
Auto merged
storage/innobase/include/page0page.ic:
Auto merged
storage/innobase/include/univ.i:
Auto merged
storage/innobase/row/row0mysql.c:
Auto merged
storage/innobase/row/row0sel.c:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_static.c:
Auto merged
storage/myisam/myisamdef.h:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/ndb/include/kernel/signaldata/SignalData.hpp:
Auto merged
storage/ndb/include/kernel/signaldata/StartFragReq.hpp:
Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
Auto merged
storage/ndb/src/common/debugger/signaldata/StartRec.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
Auto merged
storage/ndb/src/kernel/main.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
Auto merged
sql/log_event.cc:
SCCS merged
sql/sql_prepare.cc:
SCCS merged
sql/share/errmsg.txt:
merge
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/t/variables.test:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/r/variables.result:
Resolve conflict
scripts/mysqld_multi.sh:
Resolve conflict
BitKeeper/etc/config:
Auto merged
Makefile.am:
Auto merged
VC++Files/sql/mysqld.vcproj:
Auto merged
configure.in:
Auto merged
extra/perror.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysys/Makefile.am:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/examples/ha_tina.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/unireg.h:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/myisam/mi_search.c:
Auto merged
storage/myisam/myisamchk.c:
Auto merged
storage/myisam/myisamlog.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
Auto merged
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
Auto merged
BitKeeper/deleted/.del-GrepInit.cpp~df28ab3a892455fd:
Auto merged
BitKeeper/deleted/.del-Makefile.am~f73be89578d3b6cc:
Auto merged
BitKeeper/deleted/.del-Makefile~b293ae88e4394490:
Auto merged
BitKeeper/deleted/.del-Makefile~e0b7d67078f0fae0:
Auto merged
BitKeeper/deleted/.del-grep_systab_test.cpp~c7305578bec8cb62:
Auto merged
BitKeeper/etc/config:
Auto merged
config/ac-macros/ha_ndbcluster.m4:
Auto merged
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
BitKeeper/deleted/.del-testGrep.cpp~2106eb0a6bf2a1b5:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysys/Makefile.am:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/lex.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
storage/heap/hp_delete.c:
Auto merged
storage/innobase/btr/btr0pcur.c:
Auto merged
storage/innobase/btr/btr0sea.c:
Auto merged
storage/innobase/include/read0read.h:
Auto merged
storage/innobase/include/srv0srv.h:
Auto merged
storage/innobase/include/trx0trx.h:
Auto merged
storage/innobase/include/univ.i:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/innobase/read/read0read.c:
Auto merged
storage/innobase/row/row0ins.c:
Auto merged
storage/innobase/row/row0sel.c:
Auto merged
storage/innobase/row/row0umod.c:
Auto merged
storage/innobase/row/row0upd.c:
Auto merged
storage/innobase/srv/srv0srv.c:
Auto merged
storage/innobase/srv/srv0start.c:
Auto merged
storage/innobase/trx/trx0trx.c:
Auto merged
storage/myisam/ft_boolean_search.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisammrg/myrg_static.c:
Auto merged
storage/ndb/include/kernel/AttributeDescriptor.hpp:
Auto merged
storage/ndb/include/kernel/BlockNumbers.h:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/kernel/kernel_types.h:
Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/include/portlib/NdbTCP.h:
Auto merged
storage/ndb/src/common/debugger/BlockNames.cpp:
Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
Auto merged
storage/ndb/src/common/portlib/NdbTCP.cpp:
Auto merged
storage/ndb/src/common/portlib/win32/NdbTCP.c:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/kernel/Makefile.am:
Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
Auto merged
storage/ndb/tools/Makefile.am:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
support-files/mysql.spec.sh:
Auto merged
VC++Files/sql/mysqld.dsp:
Manual 5.0 - 5.1 merge
configure.in:
Manual 5.0 - 5.1 merge
sql/mysql_priv.h:
Manual 5.0 - 5.1 merge
sql/share/errmsg.txt:
Manual 5.0 - 5.1 merge
sql/sql_base.cc:
Manual 5.0 - 5.1 merge
sql/sql_prepare.cc:
Manual 5.0 - 5.1 merge
storage/ndb/src/common/util/version.c:
Manual 5.0 - 5.1 merge
storage/ndb/src/kernel/blocks/dblqh/Makefile.am:
Manual 5.0 - 5.1 merge
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
BitKeeper/etc/config:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/information_schema_db.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
mysys/default.c:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/item.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/tztime.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/innobase/buf/buf0buf.c:
Auto merged
storage/innobase/include/os0file.h:
Auto merged
storage/innobase/include/read0read.h:
Auto merged
storage/innobase/include/read0types.h:
Auto merged
storage/innobase/include/trx0trx.h:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/read/read0read.c:
Auto merged
storage/innobase/row/row0sel.c:
Auto merged
storage/innobase/srv/srv0srv.c:
Auto merged
storage/innobase/srv/srv0start.c:
Auto merged
storage/innobase/trx/trx0sys.c:
Auto merged
storage/innobase/trx/trx0trx.c:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/sort.c:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
storage/ndb/src/common/portlib/NdbMutex.c:
Auto merged
storage/ndb/src/common/portlib/NdbThread.c:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
support-files/mysql.spec.sh:
Auto merged
configure.in:
Manual merge 5.0 -> 5.1
mysql-test/t/alter_table.test:
Manual merge 5.0 -> 5.1
sql/share/errmsg.txt:
Manual merge 5.0 -> 5.1
storage/ndb/tools/Makefile.am:
Manual merge 5.0 -> 5.1
into mysql.com:/home/jimw/my/mysql-5.0-clean
client/mysqltest.c:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/errmsg.txt:
Resolve conflict
produce a sensible error when that limit is exceeded. (Bug #11602)
client/mysqltest.c:
Increase query buffer size, and explain why
mysql-test/r/system_mysql_db.result:
Update results
scripts/mysql_create_system_tables.sh:
Increase size of proc.body
scripts/mysql_fix_privilege_tables.sql:
Increase size of proc.body
sql/share/errmsg.txt:
Add error for SP routines that are too long
sql/sp.cc:
Raise an error when the SP body is too long.
sql/sp.h:
Add error for SP body being too long.
sql/sql_parse.cc:
Handle SP_BODY_TOO_LONG error.
mysql-test/r/sp-big.result:
New BitKeeper file ``mysql-test/r/sp-big.result''
mysql-test/t/sp-big.test:
New BitKeeper file ``mysql-test/t/sp-big.test''
make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
- removed make_win_binary_distribution.sh
BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
Auto merged
scripts/Makefile.am:
- after merge fix: removed the "all" target - these files are now built via
noinst_SCRIPTS instead.
make_win_src_distribution are created, but not installed
- removed make_win_binary_distribution.sh as it's obsolete and outdated
BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
Delete: scripts/make_win_binary_distribution.sh
scripts/Makefile.am:
- Make sure the scripts make_binary_distribution, make_sharedlib_distribution and
make_win_src_distribution are created, but not installed. This is the proper fix
for what I began in the previous ChangeSet
- removed make_win_binary_distribution.sh from the distribution, as it's obsolete
and outdated
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the tools for Windows:
1) When the source package is created, there is the additional level "storage".
2) The project files below "VC++Files" also get that additional directory level, to keep structures in sync.
3) Within the project files, references to/from the table handlers must cross that level.
VC++Files/storage/bdb/build_win32/Berkeley_DB.dsw:
mvdir
VC++Files/storage/bdb/build_win32/db_archive.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_buildall.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_checkpoint.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_deadlock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dll.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_dump.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_java.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_load.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_printlog.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_recover.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_stat.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_static1.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_tcl.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_test.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_upgrade.dsp:
mvdir
VC++Files/storage/bdb/build_win32/db_verify.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/ex_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_access.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_btrec.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_env.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_lock.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_mpool.dsp:
mvdir
VC++Files/storage/bdb/build_win32/excxx_tpcb.dsp:
mvdir
VC++Files/storage/bdb/build_win32/libdb.def:
mvdir
VC++Files/storage/bdb/build_win32/libdb_tcl.def:
mvdir
VC++Files/mysql.dsw:
Table handlers "bdb", "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/mysql_ia64.dsw:
Table handlers "heap", "innobase", "myisam", and "myisammrg"
have been moved into a common subdirectory "storage".
This must be reflected in the hierarchy of project files.
VC++Files/sql/mysqld.dsp:
Table handler "bdb" has been moved into a subdirectory "storage".
File "myrg_rnext_same.c" belongs to project "myisammrg".
VC++Files/storage/bdb/bdb.dsp:
Table handler "bdb" has been moved into a subdirectory "storage",
so the path to the directories keeping the libraries must point one level higher.
VC++Files/storage/heap/heap.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/heap/heap_ia64.dsp:
Table handler "heap" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
scripts/make_win_src_distribution.sh:
Table handlers "bdb", "heap", "innobase", "myisam", "myisammrg", and "ndb"
have been moved into a common subdirectory "storage".
This must be reflected when creating a source package for Windows.
VC++Files/storage/innobase/innobase.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/innobase/innobase_ia64.dsp:
Table handler "innobase" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisam/myisam_ia64.dsp:
Table handler "myisam" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
VC++Files/storage/myisammrg/myisammrg_ia64.dsp:
Table handler "myisammrg" has been moved into a subdirectory "storage",
so the pathes to the directories keeping the global includes and libraries must point one level higher.
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
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
extra/perror.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
BitKeeper/deleted/.del-var~62c955ccf2da1a21:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.hpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
into mysql.com:/home/jimw/my/mysql-5.0-clean
extra/perror.c:
Auto merged
include/my_global.h:
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/ps_7ndb.result:
Auto merged
mysql-test/r/select.result:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/des_key_file.cc:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/t/select.test:
Resolve conflicts
scripts/mysqld_safe.sh:
Resolve conflict
sql/item.cc:
Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR
can be longer in 5.0 than 4.1.
sql/log_event.cc:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/mysqld.cc:
Remove incorrect fix (merge from 4.1)
sql/sql_show.cc:
Resolve conflict
BitKeeper/etc/logging_ok:
auto-union
BUILD/autorun.sh:
Auto merged
BitKeeper/etc/config:
Auto merged
Makefile.am:
Auto merged
include/my_bitmap.h:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/ps_6bdb.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
mysys/Makefile.am:
Auto merged
mysys/default.c:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/heap/Makefile.am:
Auto merged
storage/heap/hp_hash.c:
Auto merged
storage/innobase/btr/btr0btr.c:
Auto merged
storage/innobase/btr/btr0cur.c:
Auto merged
storage/innobase/configure.in:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/ibuf/ibuf0ibuf.c:
Auto merged
storage/innobase/include/os0file.h:
Auto merged
storage/innobase/include/page0cur.h:
Auto merged
storage/innobase/include/row0mysql.h:
Auto merged
storage/innobase/include/srv0srv.h:
Auto merged
storage/innobase/include/trx0trx.h:
Auto merged
storage/innobase/include/trx0trx.ic:
Auto merged
storage/innobase/lock/lock0lock.c:
Auto merged
storage/innobase/log/log0recv.c:
Auto merged
storage/innobase/os/os0file.c:
Auto merged
storage/innobase/page/page0cur.c:
Auto merged
storage/innobase/page/page0page.c:
Auto merged
storage/innobase/rem/rem0rec.c:
Auto merged
storage/innobase/row/row0mysql.c:
Auto merged
storage/innobase/row/row0sel.c:
Auto merged
storage/innobase/row/row0upd.c:
Auto merged
storage/innobase/srv/srv0srv.c:
Auto merged
storage/innobase/trx/trx0trx.c:
Auto merged
storage/innobase/trx/trx0undo.c:
Auto merged
storage/myisam/Makefile.am:
Auto merged
storage/myisam/mi_create.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisam/mi_packrec.c:
Auto merged
storage/myisam/mi_unique.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisammrg/Makefile.am:
Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/test/ndbapi/create_tab.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
support-files/mysql.spec.sh:
Auto merged
configure.in:
merge
mysql-test/t/disabled.def:
merge
mysys/my_bitmap.c:
SCCS merged
sql/ha_federated.cc:
merge
sql/ha_innodb.cc:
merge
sql/ha_ndbcluster.cc:
merge
sql/mysqld.cc:
e
merge
sql/sql_insert.cc:
merge
sql/sql_lex.h:
merge
sql/sql_load.cc:
merge
sql/sql_select.cc:
merge
e
C
sql/sql_update.cc:
merge
sql/table.cc:
merge
Two separate problems. A key buffer was too small in sp.cc for multi-byte
fields, and the creation and fixing of mysql.proc in the scripts hadn't been
updated with the correct character sets and collations (like the other
system tables had).
Note: No special test case, as the use of utf8 for mysql.proc will make
any existing crash (if the buffer overrrun wasn't fixed).
mysql-test/r/sp-error.result:
Updated test case for too long SP names (as the limit has increased with the use of utf8).
mysql-test/t/sp-error.test:
Updated test case for too long SP names (as the limit has increased with the use of utf8).
scripts/mysql_create_system_tables.sh:
Use utf8 for mysql.proc, just like for the other system tables.
scripts/mysql_fix_privilege_tables.sql:
Use utf8 for mysql.proc, just like for the other system tables.
(Some tabs also replaced by space)
sql/sp.cc:
Use a larger key buffer for stored procedures to avoid stack overrun with multi-byte keys.
mysql-test/Makefile.am:
- added mysql-test/t/*.def to the source distribution and make sure that "make install"
installs it, too.
scripts/make_binary_distribution.sh:
- added mysql-test/t/*.def to the binary distribution
all versions: added an option "--machine" that allows to override the autodetected
architecture string (e.g. "i386") that becomes part of the binary package name with
a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
script
scripts/make_binary_distribution.sh:
- backported and fixed a change from 5.0 for easier building of all versions: added an
option "--machine" that allows to override the autodetected architecture string
(e.g. "i386") that becomes part of the binary package name with a different one
- moved the removal of the BASE directory to the end of the script
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/query_cache.result:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/grant.result:
Merge
mysql-test/t/grant.test:
Merge
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/view.result:
SCCS merged
mysql-test/t/view.test:
SCCS merged
mysql-test/r/grant.result:
test of new table privileges
mysql-test/r/system_mysql_db.result:
added new table priveleges
mysql-test/r/view_grant.result:
error changed
mysql-test/t/grant.test:
test of new table privileges
mysql-test/t/view_grant.test:
error changed
scripts/mysql_create_system_tables.sh:
add new table privileges
scripts/mysql_fix_privilege_tables.sql:
fixed system tables fix script
sql/sql_acl.h:
fixed coding/decoding new tables grants
Makefile.am:
Auto merged
myisam/mi_create.c:
Auto merged
myisam/mi_open.c:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysys/thr_alarm.c:
Auto merged
VC++Files/sql/mysqld.dsp:
Keep old
client/mysqldump.c:
Manual merge
client/mysqltest.c:
Automatic merge
configure.in:
Manual merge
mysql-test/r/ctype_ucs.result:
Auto merge
mysql-test/r/func_str.result:
Auto merge
mysql-test/r/group_by.result:
Auto merge
mysql-test/r/insert_select.result:
Auto merge
mysql-test/r/insert_update.result:
Auto merge
mysql-test/r/lowercase_table2.result:
Auto merge
mysql-test/r/select.result:
Manual merge
mysql-test/r/variables.result:
Auto merge
mysql-test/t/ctype_ucs.test:
Auto merge
mysql-test/t/func_str.test:
Auto merge
mysql-test/t/group_by.test:
Auto merge
mysql-test/t/insert_select.test:
Auto merge
mysql-test/t/insert_update.test:
Auto merge
mysql-test/t/ndb_alter_table.test:
Auto merge
mysql-test/t/select.test:
Auto merge
mysql-test/t/variables.test:
Auto merge
mysys/my_access.c:
Auto merge
scripts/make_win_src_distribution.sh:
Auto merge
sql/field.cc:
Manual merge
sql/ha_ndbcluster.cc:
Auto merge
sql/handler.cc:
Auto merge
sql/item.cc:
Auto merge
sql/item.h:
Manual merge
sql/item_cmpfunc.h:
Auto merge
sql/item_strfunc.cc:
Auto merge
sql/item_strfunc.h:
Auto merge
sql/mysql_priv.h:
manual merge
sql/mysqld.cc:
manual merge
sql/opt_range.cc:
manual merge
sql/set_var.cc:
Auto merge
sql/sql_base.cc:
manual merge
Restore processing of ON DUPLICATE KEY UPDATE
sql/sql_insert.cc:
manual merge
Restore processing of ON DUPLICATE KEY UPDATE
Simplify mysql_prepare_insert by using local variable for select_lex and save old values just before they are changed
sql/sql_parse.cc:
Restore processing of ON DUPLICATE KEY UPDATE
sql/sql_prepare.cc:
New ON DUPLICATE KEY UPDATE handling
sql/sql_select.cc:
manual merge
sql/sql_table.cc:
auto merge
sql/sql_yacc.yy:
auto merge
strings/ctype-ucs2.c:
auto merge
strings/ctype-utf8.c:
auto merge
Bug#11009, some more cleanup of unneded files from bootstrap
scripts/make_win_src_distribution.sh:
Bug#11009, some more cleanup of unneded files from bootstrap
different DATADIR via the command line or during ./configure and
still starting up mysqld_safe via a relative path. (Bug #7249)
scripts/mysqld_safe.sh:
Decouple figuring out which BASEDIR and DATADIR to use so that
the only DATADIR we'll try to use without first verifying that
it exists is the compiled-in default.
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/ndb/include/kernel/AttributeList.hpp:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
Auto merged
storage/ndb/include/util/SimpleProperties.hpp:
Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
Auto merged
storage/ndb/tools/restore/Restore.hpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
sql/sql_parse.cc:
Auto merged
"make install" is called (mysql_delimiter.sql was missing)
mysql-test/Makefile.am:
- make sure to include mysql-test/t/*.sql files in the binary distributions
(mysql_delimiter.sql was missing)
scripts/make_binary_distribution.sh:
- make sure to include mysql-test/t/*.sql files when doing a "make install"
(mysql_delimiter.sql was missing)
BitKeeper/etc/logging_ok:
auto-union
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/mi_rnext_same.c:
Auto merged
support-files/mysql.spec.sh:
Auto merged
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_key.c:
Auto merged
mysql-test/r/ctype_utf8.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
sql/item_buff.cc:
Auto merged
sql/sql_class.cc:
Auto merged
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
storage/ndb/include/transporter/TransporterRegistry.hpp:
Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/SHM_Buffer.hpp:
Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.cpp:
Auto merged
storage/ndb/src/common/transporter/SHM_Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/SendBuffer.cpp:
Auto merged
storage/ndb/src/common/transporter/SendBuffer.hpp:
Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/Transporter.hpp:
Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
Auto merged
storage/ndb/test/tools/hugoLoad.cpp:
Auto merged
storage/ndb/test/tools/hugoPkUpdate.cpp:
Auto merged
storage/ndb/test/tools/hugoScanRead.cpp:
Auto merged
storage/ndb/test/tools/hugoScanUpdate.cpp:
Auto merged
storage/ndb/tools/Makefile.am:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
support-files/mysql.spec.sh:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
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
BitKeeper/etc/ignore:
Added scripts/mysqlhotcopy.sh.rej to the ignore list
scripts/mysqlhotcopy.sh:
BUG#7967 Use fetchrow_hashref() when parsing SHOW SLAVE STATUS so
that --record-log-pos option will work with all versions from 3.23
forward and will not break again in the future if additional columns
are added.
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
Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable.
scripts/mysqld_safe.sh:
Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable.
Without this patch, running mysqld_safe gives:
Could not open required defaults file: /opt/home/tim/m/50/m/data/my.cnf
Fatal error in defaults handling. Program aborted
Could not open required defaults file: /opt/home/tim/m/50/m/data/my.cnf
Fatal error in defaults handling. Program aborted
These errors are printed by my_print_defaults; mysqld also encounters the
same problem and quits.
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/ndb/src/common/util/version.c:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
BUILD/compile-alpha-cxx:
Auto merged
BUILD/compile-alpha-debug:
Auto merged
configure.in:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Add YASSL to Windows source distribution
Skip .deps, and remove .o files from source dist
scripts/make_win_src_distribution.sh:
Add YASSL to Windows source distribution
Skip .deps, and remove .o files from source dist
To be safe, put "..." around variables to the test command
scripts/make_binary_distribution.sh:
To be safe, put "..." around variables to the test command
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Rename some functions
more fine-grained sp privileges
make grant/revoke sp grammar less ambigious
mysql-test/r/sp-security.result:
change test for new syntax
mysql-test/r/system_mysql_db.result:
change test for new syntax
mysql-test/t/sp-security.test:
change test for new syntax
scripts/mysql_create_system_tables.sh:
now store routine_type for procs_priv
scripts/mysql_fix_privilege_tables.sql:
now store routine_type for procs_priv
sql/item_func.cc:
rename of function
sql/mysql_priv.h:
rename of function
sql/sp_head.cc:
extra arg for check_some_routine_access
sql/sql_acl.cc:
rename of function. now handle func/proc acls seperately
sql/sql_acl.h:
rename of function
sql/sql_parse.cc:
rename of function
grants for procs handled distinctly from funcs
sql/sql_show.cc:
check_some_routine_access extra arg
sql/sql_base.cc:
fix for build
sql/sql_yacc.yy:
fix for build
Sad to say good bye to my contribution - this is hara-kiri, but that's for the sake of not confusing our users with a now useless script.
BitKeeper/deleted/.del-mysql_tableinfo.sh~c715458838a2a818:
Delete: scripts/mysql_tableinfo.sh
scripts/Makefile.am:
mysql_tableinfo removed
support-files/mysql.spec.sh:
mysql_tableinfo removed
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
storage/heap/hp_hash.c:
Auto merged
mysql-test/t/range.test:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_udf.h:
Auto merged
mysql-test/r/mysqldump.result:
Manual merge.
mysql-test/t/mysqldump.test:
Manual merge.
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BUILD/FINISH.sh:
Auto merged
BUILD/compile-dist:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/ndb/src/cw/cpcd/Process.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
- Remove vendor tag from package names.
- Map standard OS names to user-friendly versions.
scripts/make_binary_distribution.sh:
- Remove vendor tag from package names.
- Map standard OS names to user-friendly versions.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/lock.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
storage/heap/hp_hash.c:
Auto merged
storage/innobase/dict/dict0dict.c:
Auto merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/include/dict0dict.h:
Auto merged
storage/myisam/Makefile.am:
Auto merged
storage/myisam/mi_key.c:
Auto merged
storage/myisam/myisampack.c:
Auto merged
storage/myisammrg/myrg_open.c:
Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_parse.cc:
Auto merged
configure.in:
merge
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/r/grant.result:
Auto merged
scripts/mysql_create_system_tables.sh:
Auto merged
scripts/mysql_fix_privilege_tables.sql:
Auto merged
sql/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
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
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
