mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 15835a5693 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  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_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
2007-08-01 18:40:02 -06:00
..
examples
share WL#3984 (Revise locking of mysql.general_log and mysql.slow_log) 2007-07-27 00:31:06 -06:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt Bug#30103 CMake build solution does not remove auto-generated resources 2007-07-27 17:41:34 -04:00
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 (Pushing for Andrei) 2007-07-30 19:02:21 +03:00
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 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
handler.h Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120 2007-07-31 12:09:59 +05:00
item.h Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120 2007-07-31 12:09:59 +05:00
item_buff.cc
item_cmpfunc.cc
item_cmpfunc.h
item_create.cc After-merge fixup. 2007-08-01 19:20:25 +05:00
item_create.h
item_func.cc Merge mysql.com:/home/ram/work/b29928.new/b29928.new.5.0 2007-08-01 15:31:20 +05:00
item_func.h
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc
item_strfunc.h Merge mysql.com:/home/hf/work/29878/my50-29878 2007-07-27 22:43:33 +05:00
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 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-07-31 23:47:38 +04:00
log.cc Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
log.h Code review changes 2007-07-27 12:19:36 -06:00
log_event.cc After-merge fixup. 2007-08-01 19:20:25 +05:00
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 Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 2007-07-31 20:00:05 +04:00
mysqld.cc Merge damien-katzs-computer.local:/Users/dkatz/50_hpux 2007-07-27 13:41:11 -04:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc A fix and a test case for Bug#24918 drop table and lock / inconsistent 2007-07-27 16:37:29 +04:00
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 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
set_var.h
slave.cc WL#3984 (Revise locking of mysql.general_log and mysql.slow_log) 2007-07-27 00:31:06 -06:00
slave.h
sp.cc Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-07-27 12:22:00 -06:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-07-31 14:59:52 +03:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc WL#3984 (Revise locking of mysql.general_log and mysql.slow_log) 2007-07-27 00:31:06 -06:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
sql_binlog.cc
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc
sql_cache.h
sql_class.cc Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
sql_class.h Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
sql_client.cc
sql_connect.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc
sql_delete.cc Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
sql_derived.cc
sql_do.cc
sql_error.cc WL#3984 (Revise locking of mysql.general_log and mysql.slow_log) 2007-07-27 00:31:06 -06:00
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
sql_lex.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-07-31 23:47:38 +04:00
sql_lex.h
sql_list.cc
sql_list.h
sql_load.cc (Pushing for Andrei) 2007-07-30 19:02:21 +03:00
sql_locale.cc
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
sql_partition.cc
sql_partition.h
sql_plugin.cc WL#3984 (Revise locking of mysql.general_log and mysql.slow_log) 2007-07-27 00:31:06 -06:00
sql_plugin.h
sql_prepare.cc
sql_rename.cc WL#3984 (Revise locking of mysql.general_log and mysql.slow_log) 2007-07-27 00:31:06 -06:00
sql_repl.cc
sql_repl.h
sql_select.cc Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
sql_select.h Merge mysql.com:/home/hf/work/29717/my50-29717 2007-07-31 11:12:23 +05:00
sql_servers.cc WL#3984 (Revise locking of mysql.general_log and mysql.slow_log) 2007-07-27 00:31:06 -06:00
sql_servers.h
sql_show.cc Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
sql_tablespace.cc
sql_test.cc
sql_trigger.cc
sql_trigger.h
sql_udf.cc WL#3984 (Revise locking of mysql.general_log and mysql.slow_log) 2007-07-27 00:31:06 -06:00
sql_udf.h
sql_union.cc
sql_update.cc Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-opt 2007-07-31 14:48:57 +03:00
sql_view.cc
sql_view.h
sql_yacc.yy Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-08-01 18:40:02 -06:00
table.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-07-31 23:47:38 +04:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc
tztime.h
udf_example.c
udf_example.def
uniques.cc
unireg.cc
unireg.h