mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
2361720c98
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 |
||
---|---|---|
.. | ||
examples | ||
share | ||
.cvsignore | ||
add_errmsg | ||
client_settings.h | ||
custom_conf.h | ||
derror.cc | ||
des_key_file.cc | ||
discover.cc | ||
field.cc | ||
field.h | ||
field_conv.cc | ||
filesort.cc | ||
frm_crypt.cc | ||
gen_lex_hash.cc | ||
gstream.cc | ||
gstream.h | ||
ha_archive.cc | ||
ha_archive.h | ||
ha_berkeley.cc | ||
ha_berkeley.h | ||
ha_blackhole.cc | ||
ha_blackhole.h | ||
ha_federated.cc | ||
ha_federated.h | ||
ha_heap.cc | ||
ha_heap.h | ||
ha_innodb.cc | ||
ha_innodb.h | ||
ha_myisam.cc | ||
ha_myisam.h | ||
ha_myisammrg.cc | ||
ha_myisammrg.h | ||
ha_ndbcluster.cc | ||
ha_ndbcluster.h | ||
ha_partition.cc | ||
ha_partition.h | ||
handler.cc | ||
handler.h | ||
hash_filo.cc | ||
hash_filo.h | ||
hostname.cc | ||
init.cc | ||
item.cc | ||
item.h | ||
item_buff.cc | ||
item_cmpfunc.cc | ||
item_cmpfunc.h | ||
item_create.cc | ||
item_create.h | ||
item_func.cc | ||
item_func.h | ||
item_geofunc.cc | ||
item_geofunc.h | ||
item_row.cc | ||
item_row.h | ||
item_strfunc.cc | ||
item_strfunc.h | ||
item_subselect.cc | ||
item_subselect.h | ||
item_sum.cc | ||
item_sum.h | ||
item_timefunc.cc | ||
item_timefunc.h | ||
item_uniq.cc | ||
item_uniq.h | ||
key.cc | ||
lex.h | ||
lex_symbol.h | ||
lock.cc | ||
log.cc | ||
log_event.cc | ||
log_event.h | ||
Makefile.am | ||
matherr.c | ||
mf_iocache.cc | ||
my_decimal.cc | ||
my_decimal.h | ||
my_lock.c | ||
mysql_priv.h | ||
mysqld.cc | ||
mysqld_suffix.h | ||
net_serv.cc | ||
nt_servc.cc | ||
nt_servc.h | ||
opt_range.cc | ||
opt_range.h | ||
opt_sum.cc | ||
parse_file.cc | ||
parse_file.h | ||
password.c | ||
procedure.cc | ||
procedure.h | ||
protocol.cc | ||
protocol.h | ||
records.cc | ||
repl_failsafe.cc | ||
repl_failsafe.h | ||
rpl_filter.cc | ||
rpl_filter.h | ||
set_var.cc | ||
set_var.h | ||
slave.cc | ||
slave.h | ||
sp.cc | ||
sp.h | ||
sp_cache.cc | ||
sp_cache.h | ||
sp_head.cc | ||
sp_head.h | ||
sp_pcontext.cc | ||
sp_pcontext.h | ||
sp_rcontext.cc | ||
sp_rcontext.h | ||
spatial.cc | ||
spatial.h | ||
sql_acl.cc | ||
sql_acl.h | ||
sql_analyse.cc | ||
sql_analyse.h | ||
sql_array.h | ||
sql_base.cc | ||
sql_bitmap.h | ||
sql_cache.cc | ||
sql_cache.h | ||
sql_class.cc | ||
sql_class.h | ||
sql_client.cc | ||
sql_crypt.cc | ||
sql_crypt.h | ||
sql_cursor.cc | ||
sql_cursor.h | ||
sql_db.cc | ||
sql_delete.cc | ||
sql_derived.cc | ||
sql_do.cc | ||
sql_error.cc | ||
sql_error.h | ||
sql_handler.cc | ||
sql_help.cc | ||
sql_insert.cc | ||
sql_lex.cc | ||
sql_lex.h | ||
sql_list.cc | ||
sql_list.h | ||
sql_load.cc | ||
sql_manager.cc | ||
sql_manager.h | ||
sql_map.cc | ||
sql_map.h | ||
sql_olap.cc | ||
sql_parse.cc | ||
sql_partition.cc | ||
sql_prepare.cc | ||
sql_rename.cc | ||
sql_repl.cc | ||
sql_repl.h | ||
sql_select.cc | ||
sql_select.h | ||
sql_show.cc | ||
sql_sort.h | ||
sql_state.c | ||
sql_string.cc | ||
sql_string.h | ||
sql_table.cc | ||
sql_test.cc | ||
sql_trigger.cc | ||
sql_trigger.h | ||
sql_udf.cc | ||
sql_udf.h | ||
sql_union.cc | ||
sql_update.cc | ||
sql_view.cc | ||
sql_view.h | ||
sql_yacc.yy | ||
stacktrace.c | ||
stacktrace.h | ||
strfunc.cc | ||
structs.h | ||
table.cc | ||
table.h | ||
thr_malloc.cc | ||
time.cc | ||
tzfile.h | ||
tztime.cc | ||
tztime.h | ||
udf_example.cc | ||
uniques.cc | ||
unireg.cc | ||
unireg.h | ||
watchdog_mysqld |