mariadb/sql
gni@dev3-221.dev.cn.tlan 305d0eaf02 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
2007-05-08 09:52:27 +08:00
..
examples
share BUG#27818 comedy of errors 2007-04-19 18:58:32 +02:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt Bug#24732 Executables do not include Vista manifests 2007-04-23 16:23:32 -04:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 2007-04-20 15:31:41 -06:00
event_data_objects.h Fix rpl_events test failure in the runtime tree. 2007-04-13 23:53:05 -04:00
event_db_repository.cc Small fixes for merge. 2007-04-10 18:01:29 +03:00
event_db_repository.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-04-05 15:49:46 +04:00
event_queue.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-10 16:28:47 +03:00
event_queue.h A set of changes aiming to make the Event Scheduler more user-friendly 2007-04-05 15:24:34 +04:00
event_scheduler.cc An attempt to fix a sporadic valgrind memory leak in Event Scheduler: 2007-04-13 16:35:56 -04:00
event_scheduler.h A set of changes aiming to make the Event Scheduler more user-friendly 2007-04-05 15:24:34 +04:00
events.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-14 18:31:43 -04:00
events.h Post-merge and post-review fixes for the patch for 2007-04-05 20:47:22 +04:00
field.cc Merge bk@192.168.21.1:mysql-5.1 2007-04-29 18:52:14 +05:00
field.h Merge bk@192.168.21.1:mysql-5.1 2007-04-29 18:52:14 +05:00
field_conv.cc Merge mysql.com:/home/bar/mysql-5.0.b20095 2007-04-13 10:08:52 +05:00
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2007-05-08 09:52:27 +08:00
ha_ndbcluster.h Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 2007-04-24 15:11:22 +02:00
ha_ndbcluster_binlog.cc Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 2007-04-25 15:28:56 +02:00
ha_ndbcluster_binlog.h Bug #27076 Cluster does not honor SQL_LOG_BIN flag 2007-04-18 16:02:20 +02:00
ha_ndbcluster_cond.cc ha_ndbcluster.h, ha_ndbcluster.cc: 2007-04-24 14:24:06 +02:00
ha_ndbcluster_cond.h ha_ndbcluster.h, ha_ndbcluster.cc: 2007-04-24 14:24:06 +02:00
ha_ndbcluster_tables.h
ha_partition.cc - Resolved conflict between fixes for bugs 25141 and 26074. 2007-04-24 16:07:52 -04:00
ha_partition.h
handler.cc Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2007-05-08 09:52:27 +08:00
handler.h Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines 2007-03-31 17:29:40 +05:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 2007-04-29 13:19:32 +05:00
item.h Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 2007-04-29 13:19:32 +05:00
item_buff.cc
item_cmpfunc.cc merging fix 2007-04-30 09:25:38 +05:00
item_cmpfunc.h Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 2007-04-29 13:19:32 +05:00
item_create.cc
item_create.h
item_func.cc Merge polly.local:/home/kaa/src/maint/mysql-5.0-maint 2007-04-28 23:27:24 +04:00
item_func.h Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 2007-05-01 18:13:29 +02:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Merge polly.local:/home/kaa/src/maint/bug24912/my50-bug24912 2007-04-28 20:26:14 +04:00
item_strfunc.h Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 2007-04-21 00:33:56 +04:00
item_subselect.cc - addendum of the fix for bug 27786: 2007-04-23 14:16:49 +03:00
item_subselect.h Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 2007-04-21 00:33:56 +04:00
item_sum.cc Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 2007-04-29 13:19:32 +05:00
item_sum.h
item_timefunc.cc merging fix 2007-04-29 18:46:06 +05:00
item_timefunc.h
item_xmlfunc.cc
item_xmlfunc.h
key.cc Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 2007-04-29 13:19:32 +05:00
lex.h
lex_symbol.h
lock.cc
log.cc Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 2007-04-20 10:46:58 +02:00
log.h
log_event.cc Bug #27691 bk compilation with VC++ 2005 fails 2007-04-23 16:42:57 -04:00
log_event.h Fixes to make it compile when using Sun CC and restoring some changes 2007-04-13 19:19:10 +02:00
log_event_old.cc Minor fixes. 2007-04-24 12:41:08 -04:00
log_event_old.h WL#2735: Refactor replication 2007-04-13 14:55:28 +02:00
Makefile.am Added missing backslash 2007-04-24 17:42:16 +02:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge polly.local:/home/kaa/src/maint/bug24912/my50-bug24912 2007-04-28 20:26:14 +04:00
mysqld.cc Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2007-05-08 09:52:27 +08:00
mysqld_suffix.h
net_serv.cc Fixed federated and some replication tests to not stop slave until it's up and running. 2007-04-17 14:41:16 +03:00
nt_servc.cc
nt_servc.h
opt_range.cc
opt_range.h
opt_sum.cc
parse_file.cc Merge vajra.(none):/opt/local/work/mysql-5.0-runtime 2007-04-06 21:18:25 +04:00
parse_file.h
partition_element.h
partition_info.cc aftermerging fix 2007-04-05 13:25:39 +05:00
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
records.cc
repl_failsafe.cc Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-04-12 09:10:45 +02:00
repl_failsafe.h
rpl_constants.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc Bug#17095 circular replication for ndb 2007-04-12 16:13:49 +02:00
rpl_injector.h Bug #21494 Master Cluster MySQLD is point of failure that can lead to mismatch slave data 2007-04-03 14:31:46 +02:00
rpl_mi.cc
rpl_mi.h Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-04-12 09:10:45 +02:00
rpl_record.cc Fixes to make it compile when using Sun CC and restoring some changes 2007-04-13 19:19:10 +02:00
rpl_record.h WL#2735: Refactor replication 2007-04-13 14:55:28 +02:00
rpl_record_old.cc WL#2735: Refactor replication 2007-04-13 14:55:28 +02:00
rpl_record_old.h WL#2735: Refactor replication 2007-04-13 14:55:28 +02:00
rpl_rli.cc Fixes to make it compile when using Sun CC and restoring some changes 2007-04-13 19:19:10 +02:00
rpl_rli.h Fixes to make it compile when using Sun CC and restoring some changes 2007-04-13 19:19:10 +02:00
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc
rpl_utility.h
scheduler.cc
scheduler.h
set_var.cc Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2007-05-08 09:52:27 +08:00
set_var.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-04-05 15:49:46 +04:00
slave.cc Merge romeo.(none):/home/bk/merge-mysql-5.0 2007-04-20 10:55:50 +02:00
slave.h BUG#25688 (RBR: circular replication may cause STMT_END_F flags to be 2007-04-12 08:58:04 +02:00
sp.cc Bug#27047 INFORMATION_SCHEMA table cannot have BIGINT fields 2007-04-25 17:15:05 +05:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 2007-04-20 15:31:41 -06:00
sp_head.h Merge bk@192.168.21.1:mysql-5.1-opt 2007-04-07 14:59:53 +05:00
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 Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 2007-04-29 13:19:32 +05:00
sql_binlog.cc BUG#25688 (RBR: circular replication may cause STMT_END_F flags to be 2007-04-12 08:58:04 +02:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc
sql_cache.h
sql_class.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 2007-04-20 15:31:41 -06:00
sql_class.h Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 2007-04-20 15:31:41 -06:00
sql_client.cc
sql_connect.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel 2007-04-13 10:25:33 +03:00
sql_delete.cc Merge debian.(none):/M50/mysql-5.0 2007-04-20 12:31:03 +02:00
sql_derived.cc - addendum of the fix for bug 27786: 2007-04-23 14:16:49 +03:00
sql_do.cc
sql_error.cc Added warn_root as argument for push_back() 2007-04-11 13:27:36 +03:00
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 2007-04-20 10:46:58 +02:00
sql_lex.cc Merge janus.mylan:/usr/home/serg/Abk/mysql-5.0 2007-04-17 15:44:30 +02:00
sql_lex.h Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt 2007-04-21 00:33:56 +04:00
sql_list.cc
sql_list.h
sql_load.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-04-12 12:50:02 +03:00
sql_locale.cc
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge bk@192.168.21.1:mysql-5.1 2007-04-29 18:52:14 +05:00
sql_partition.cc Merge bk@192.168.21.1:mysql-5.1-opt 2007-04-07 14:59:53 +05:00
sql_partition.h
sql_plugin.cc Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2007-05-08 09:52:27 +08:00
sql_plugin.h
sql_prepare.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-04 21:25:39 +03:00
sql_rename.cc
sql_repl.cc Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl 2007-04-12 09:10:45 +02:00
sql_repl.h
sql_select.cc Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 2007-05-01 13:38:59 +05:00
sql_select.h
sql_servers.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-04-03 14:34:37 +04:00
sql_servers.h
sql_show.cc Bug#27047 INFORMATION_SCHEMA table cannot have BIGINT fields 2007-04-25 17:15:05 +05:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 2007-05-08 09:52:27 +08:00
sql_tablespace.cc
sql_test.cc A set of changes aiming to make the Event Scheduler more user-friendly 2007-04-05 15:24:34 +04:00
sql_trigger.cc Fix rpl_trigger.test failure in the runtime tree. 2007-04-14 17:05:41 -04:00
sql_trigger.h Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2007-04-05 08:39:12 +02:00
sql_udf.cc Merge pilot.blaudden:/home/msvensson/mysql/my51-m-mysql_upgrade 2007-04-24 11:11:45 +02:00
sql_udf.h
sql_union.cc - addendum of the fix for bug 27786: 2007-04-23 14:16:49 +03:00
sql_update.cc Merge polly.local:/home/kaa/src/maint/bug22364/my51-bug22364 2007-04-27 13:06:24 +04:00
sql_view.cc Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-04-24 16:03:06 +03:00
sql_view.h
sql_yacc.yy - addendum of the fix for bug 27786: 2007-04-23 14:16:49 +03:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt 2007-04-29 13:19:32 +05:00
table.h Bug#27047 INFORMATION_SCHEMA table cannot have BIGINT fields 2007-04-25 17:15:05 +05:00
thr_malloc.cc
time.cc merging fix 2007-04-29 18:46:06 +05:00
tzfile.h
tztime.cc
tztime.h
udf_example.c
udf_example.def
uniques.cc
unireg.cc
unireg.h