mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
f4afcec393
into hynda.mysql.fi:/home/my/mysql-maria BitKeeper/etc/ignore: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-CMakeLists.txt~99a50df6: Auto merged Makefile.am: Auto merged client/mysqldump.c: Auto merged configure.in: Auto merged include/Makefile.am: Auto merged include/keycache.h: Auto merged include/m_string.h: Auto merged include/my_sys.h: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/extra/rpl_tests/rpl_insert_delayed.test: Auto merged mysql-test/lib/mtr_cases.pl: Auto merged mysql-test/lib/mtr_misc.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/lib/mtr_report.pl: Auto merged mysql-test/lib/mtr_timer.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/suite/ndb/r/ps_7ndb.result: Auto merged mysql-test/suite/rpl/r/rpl_events.result: Auto merged mysql-test/suite/rpl/r/rpl_insert.result: Auto merged mysql-test/suite/rpl/r/rpl_row_insert_delayed.result: Auto merged mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result: Auto merged mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result: Auto merged mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result: Auto merged mysql-test/suite/rpl/t/rpl_insert.test: Auto merged mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test: Auto merged mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/view.test: Auto merged mysys/array.c: Auto merged mysys/mf_keycache.c: Auto merged mysys/my_init.c: Auto merged mysys/my_symlink2.c: Auto merged mysys/safemalloc.c: Auto merged mysys/thr_lock.c: Auto merged sql/Makefile.am: Auto merged sql/filesort.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged sql/handler.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_xmlfunc.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/net_serv.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/sql_test.cc: Auto merged sql/table.h: Auto merged sql/udf_example.c: Auto merged sql/uniques.cc: Auto merged sql/unireg.cc: Auto merged storage/csv/ha_tina.h: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ft_nlq_search.c: Auto merged storage/myisam/ft_parser.c: Auto merged storage/myisam/ft_stopwords.c: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/ha_myisam.h: Auto merged storage/myisam/mi_check.c: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/myisam/mi_dynrec.c: Auto merged storage/myisam/mi_extra.c: Auto merged storage/myisam/mi_key.c: Auto merged storage/myisam/mi_locking.c: Auto merged storage/myisam/mi_log.c: Auto merged storage/myisam/mi_packrec.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_test2.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/myisamlog.c: Auto merged storage/myisam/myisampack.c: Auto merged storage/myisam/sort.c: Auto merged storage/myisam/sp_test.c: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged storage/myisammrg/ha_myisammrg.h: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged support-files/compiler_warnings.supp: Auto merged client/mysqltest.c: Manual merge between mysql-5.1 and mysql-maria include/my_base.h: Manual merge between mysql-5.1 and mysql-maria include/my_global.h: Manual merge between mysql-5.1 and mysql-maria include/myisam.h: Manual merge between mysql-5.1 and mysql-maria libmysql/Makefile.shared: Manual merge between mysql-5.1 and mysql-maria mysql-test/r/events_logs_tests.result: Manual merge between mysql-5.1 and mysql-maria mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result: Manual merge between mysql-5.1 and mysql-maria mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test: Manual merge between mysql-5.1 and mysql-maria mysql-test/t/disabled.def: Manual merge between mysql-5.1 and mysql-maria mysql-test/t/events_logs_tests.test: Manual merge between mysql-5.1 and mysql-maria mysys/my_compress.c: Manual merge between mysql-5.1 and mysql-maria mysys/my_getsystime.c: Manual merge between mysql-5.1 and mysql-maria mysys/my_open.c: Manual merge between mysql-5.1 and mysql-maria sql/handler.cc: Manual merge between mysql-5.1 and mysql-maria sql/set_var.h: Manual merge between mysql-5.1 and mysql-maria sql/sql_class.h: Manual merge between mysql-5.1 and mysql-maria sql/sql_show.cc: Manual merge between mysql-5.1 and mysql-maria sql/sql_sort.h: Manual merge between mysql-5.1 and mysql-maria sql/sql_yacc.yy: Manual merge between mysql-5.1 and mysql-maria sql/table.cc: Manual merge between mysql-5.1 and mysql-maria storage/csv/ha_tina.cc: Manual merge between mysql-5.1 and mysql-maria storage/myisam/mi_open.c: Manual merge between mysql-5.1 and mysql-maria storage/myisam/myisamdef.h: Manual merge between mysql-5.1 and mysql-maria unittest/mysys/my_atomic-t.c: Manual merge between mysql-5.1 and mysql-maria |
||
---|---|---|
.. | ||
examples | ||
share | ||
.cvsignore | ||
add_errmsg | ||
authors.h | ||
client_settings.h | ||
CMakeLists.txt | ||
contributors.h | ||
custom_conf.h | ||
derror.cc | ||
des_key_file.cc | ||
discover.cc | ||
event_data_objects.cc | ||
event_data_objects.h | ||
event_db_repository.cc | ||
event_db_repository.h | ||
event_queue.cc | ||
event_queue.h | ||
event_scheduler.cc | ||
event_scheduler.h | ||
events.cc | ||
events.h | ||
field.cc | ||
field.h | ||
field_conv.cc | ||
filesort.cc | ||
frm_crypt.cc | ||
gen_lex_hash.cc | ||
gstream.cc | ||
gstream.h | ||
ha_ndbcluster.cc | ||
ha_ndbcluster.h | ||
ha_ndbcluster_binlog.cc | ||
ha_ndbcluster_binlog.h | ||
ha_ndbcluster_cond.cc | ||
ha_ndbcluster_cond.h | ||
ha_ndbcluster_tables.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_xmlfunc.cc | ||
item_xmlfunc.h | ||
key.cc | ||
lex.h | ||
lex_symbol.h | ||
lock.cc | ||
log.cc | ||
log.h | ||
log_event.cc | ||
log_event.h | ||
log_event_old.cc | ||
log_event_old.h | ||
Makefile.am | ||
matherr.c | ||
message.mc | ||
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 | ||
partition_element.h | ||
partition_info.cc | ||
partition_info.h | ||
password.c | ||
procedure.cc | ||
procedure.h | ||
protocol.cc | ||
protocol.h | ||
records.cc | ||
repl_failsafe.cc | ||
repl_failsafe.h | ||
rpl_constants.h | ||
rpl_filter.cc | ||
rpl_filter.h | ||
rpl_injector.cc | ||
rpl_injector.h | ||
rpl_mi.cc | ||
rpl_mi.h | ||
rpl_record.cc | ||
rpl_record.h | ||
rpl_record_old.cc | ||
rpl_record_old.h | ||
rpl_reporting.cc | ||
rpl_reporting.h | ||
rpl_rli.cc | ||
rpl_rli.h | ||
rpl_tblmap.cc | ||
rpl_tblmap.h | ||
rpl_utility.cc | ||
rpl_utility.h | ||
scheduler.cc | ||
scheduler.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_binlog.cc | ||
sql_bitmap.h | ||
sql_builtin.cc.in | ||
sql_cache.cc | ||
sql_cache.h | ||
sql_class.cc | ||
sql_class.h | ||
sql_client.cc | ||
sql_connect.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_locale.cc | ||
sql_manager.cc | ||
sql_map.cc | ||
sql_map.h | ||
sql_olap.cc | ||
sql_parse.cc | ||
sql_partition.cc | ||
sql_partition.h | ||
sql_plugin.cc | ||
sql_plugin.h | ||
sql_prepare.cc | ||
sql_rename.cc | ||
sql_repl.cc | ||
sql_repl.h | ||
sql_select.cc | ||
sql_select.h | ||
sql_servers.cc | ||
sql_servers.h | ||
sql_show.cc | ||
sql_show.h | ||
sql_sort.h | ||
sql_state.c | ||
sql_string.cc | ||
sql_string.h | ||
sql_table.cc | ||
sql_tablespace.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.c | ||
udf_example.def | ||
uniques.cc | ||
unireg.cc | ||
unireg.h |