mariadb/sql
unknown 4ddfa7ba53 Merge olga.mysql.com:/home/igor/mysql-5.1-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug33697


mysql-test/t/disabled.def:
  Auto merged
sql/sql_select.cc:
  Auto merged
2008-01-11 10:12:29 -08:00
..
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 Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows. 2007-12-07 19:27:45 -05:00
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 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-12-13 15:56:04 +04:00
events.h
field.cc Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt 2007-12-21 14:52:39 +01:00
field.h merge of bug 33256 5.0-opt -> 5.1-opt 2008-01-08 12:27:15 +02:00
field_conv.cc
filesort.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt 2008-01-10 18:03:26 +01:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-12-15 16:59:43 +03:00
ha_ndbcluster.h
ha_ndbcluster_binlog.cc Try to fix assertion failures at slave shutdown when running 2007-12-15 22:24:01 +03:00
ha_ndbcluster_binlog.h
ha_ndbcluster_cond.cc
ha_ndbcluster_cond.h
ha_ndbcluster_tables.h
ha_partition.cc Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
ha_partition.h
handler.cc
handler.h Bug#30273 - merge tables: Can't lock file (errno: 155) 2007-12-11 15:32:10 +01:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.0-opt 2008-01-08 11:49:40 +02:00
item.h Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-12-13 15:56:04 +04:00
item_buff.cc
item_cmpfunc.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-12-13 16:10:57 +04:00
item_cmpfunc.h Merge ramayana.hindu.god:/home/tsmith/m/bk/51 2007-12-05 12:33:36 -07:00
item_create.cc
item_create.h
item_func.cc Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
item_func.h Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-12-13 15:56:04 +04:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc
item_strfunc.h Merge ramayana.hindu.god:/home/tsmith/m/bk/51 2007-12-05 12:33:36 -07:00
item_subselect.cc Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt 2007-11-23 12:26:19 +02:00
item_subselect.h
item_sum.cc Merge macbook.gmz:/Users/kgeorge/mysql/work/B33256-5.0-opt 2008-01-08 11:49:40 +02:00
item_sum.h Merge linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united 2007-12-14 12:40:39 +01:00
item_timefunc.cc Bug #33256: CREATE ... SELECT creates obsolete table 2007-12-21 12:44:24 +02:00
item_timefunc.h Bug #33256: CREATE ... SELECT creates obsolete table 2007-12-21 12:44:24 +02:00
item_xmlfunc.cc
item_xmlfunc.h
key.cc Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt 2007-11-23 12:26:19 +02:00
lex.h
lex_symbol.h
lock.cc Bug#30273 - merge tables: Can't lock file (errno: 155) 2007-12-11 15:32:10 +01:00
log.cc Merge kaamos.(none):/data/src/mysql-5.1 2008-01-10 20:44:23 +03:00
log.h
log_event.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
log_event.h
log_event_old.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
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 station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
mysqld.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-12-15 16:59:43 +03:00
mysqld_suffix.h
net_serv.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
opt_range.h
opt_sum.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
parse_file.cc
parse_file.h
partition_element.h
partition_info.cc Merge stella.local:/home2/mydev/mysql-5.1-amain 2007-12-11 21:37:33 +01:00
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
protocol.h Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
records.cc Merge ramayana.hindu.god:/home/tsmith/m/bk/51 2007-12-05 12:33:36 -07:00
repl_failsafe.cc Merge kaamos.(none):/data/src/mysql-5.1 2008-01-10 20:44:23 +03:00
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 Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
rpl_record.h
rpl_record_old.cc
rpl_record_old.h
rpl_reporting.cc
rpl_reporting.h
rpl_rli.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
rpl_rli.h
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc
rpl_utility.h
scheduler.cc
scheduler.h
set_var.cc Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
set_var.h Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
slave.cc Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
slave.h
sp.cc Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-12-17 09:45:36 +01:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Merge trift2.:/MySQL/M50/merge-5.0 2007-12-21 13:13:22 +01:00
sp_head.h Merge adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153 2007-11-21 20:57:28 +01:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-12-12 18:36:10 +03:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Merge kaamos.(none):/data/src/mysql-5.1 2008-01-10 20:44:23 +03:00
sql_binlog.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
sql_cache.h
sql_class.cc Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt 2007-12-15 12:07:33 +01:00
sql_class.h Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt 2007-12-15 12:07:33 +01:00
sql_client.cc
sql_connect.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc Merge kaamos.(none):/data/src/mysql-5.1 2008-01-10 20:44:23 +03:00
sql_delete.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
sql_derived.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc Bug#23713 LOCK TABLES + CREATE TRIGGER + FLUSH TABLES WITH READ LOCK = deadlock 2007-11-29 09:42:26 -02:00
sql_help.cc
sql_insert.cc Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
sql_lex.cc
sql_lex.h Merge adventure.(none):/home/thek/Development/cpp/bug31153/my51-bug31153 2007-11-21 20:57:28 +01:00
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 Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
sql_partition.cc Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
sql_partition.h
sql_plugin.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-12-13 15:56:04 +04:00
sql_plugin.h
sql_prepare.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
sql_rename.cc Bug#23713 LOCK TABLES + CREATE TRIGGER + FLUSH TABLES WITH READ LOCK = deadlock 2007-11-29 09:42:26 -02:00
sql_repl.cc
sql_repl.h
sql_select.cc Merge olga.mysql.com:/home/igor/mysql-5.1-opt 2008-01-11 10:12:29 -08:00
sql_select.h
sql_servers.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
sql_servers.h
sql_show.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-opt 2007-11-23 12:26:19 +02:00
sql_string.h
sql_table.cc Merge trift2.:/MySQL/M51/mysql-5.1 2007-12-17 13:40:06 +01:00
sql_tablespace.cc
sql_test.cc
sql_trigger.cc Bug#23713 LOCK TABLES + CREATE TRIGGER + FLUSH TABLES WITH READ LOCK = deadlock 2007-11-29 09:42:26 -02:00
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc
sql_update.cc Merge host.loc:/home/uchum/work/5.1-opt-33699 2008-01-11 21:39:45 +04:00
sql_view.cc
sql_view.h
sql_yacc.yy Merge magare.gmz:/home/kgeorge/mysql/autopush/B19390-5.0-opt 2007-12-18 11:07:08 +02:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc Merge station.:/mnt/raid/alik/MySQL/devel/5.1 2007-12-14 16:30:22 +03:00
table.h Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-12-13 15:56:04 +04:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Bug#12713 "Error in a stored function called from a SELECT doesn't 2007-12-12 18:21:01 +03:00
tztime.h
udf_example.c Merge magare.gmz:/home/kgeorge/mysql/work/B30355-5.0-opt 2007-11-27 17:19:51 +02:00
udf_example.def
uniques.cc
unireg.cc Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2007-12-17 09:48:30 +01:00
unireg.h