mariadb/sql
unknown 79a1be4a22 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/table.cc:
  Auto merged
2006-12-27 19:24:08 +01:00
..
examples Many files: 2006-12-23 20:17:15 +01:00
share Many files: 2006-12-23 20:17:15 +01:00
.cvsignore
add_errmsg
client_settings.h Many files: 2006-12-23 20:17:15 +01:00
CMakeLists.txt Fix for bug #19121: Windows incompatible udf_example 2006-09-22 14:42:43 +02:00
custom_conf.h Many files: 2006-12-23 20:17:15 +01:00
derror.cc Many files: 2006-12-23 20:17:15 +01:00
des_key_file.cc Many files: 2006-12-23 20:17:15 +01:00
discover.cc Many files: 2006-12-23 20:17:15 +01:00
field.cc Many files: 2006-12-23 20:17:15 +01:00
field.h Many files: 2006-12-23 20:17:15 +01:00
field_conv.cc Many files: 2006-12-23 20:17:15 +01:00
filesort.cc Many files: 2006-12-23 20:17:15 +01:00
frm_crypt.cc Many files: 2006-12-23 20:17:15 +01:00
gen_lex_hash.cc Many files: 2006-12-23 20:17:15 +01:00
gstream.cc Many files: 2006-12-23 20:17:15 +01:00
gstream.h Many files: 2006-12-23 20:17:15 +01:00
ha_archive.cc Many files: 2006-12-23 20:17:15 +01:00
ha_archive.h Many files: 2006-12-23 20:17:15 +01:00
ha_berkeley.cc Many files: 2006-12-23 20:17:15 +01:00
ha_berkeley.h Many files: 2006-12-23 20:17:15 +01:00
ha_blackhole.cc Many files: 2006-12-23 20:17:15 +01:00
ha_blackhole.h Many files: 2006-12-23 20:17:15 +01:00
ha_federated.cc Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 2006-12-26 16:23:05 -08:00
ha_federated.h Many files: 2006-12-23 20:17:15 +01:00
ha_heap.cc Many files: 2006-12-23 20:17:15 +01:00
ha_heap.h Many files: 2006-12-23 20:17:15 +01:00
ha_innodb.cc Many files: 2006-12-23 20:17:15 +01:00
ha_innodb.h Many files: 2006-12-23 20:17:15 +01:00
ha_myisam.cc Many files: 2006-12-23 20:17:15 +01:00
ha_myisam.h Many files: 2006-12-23 20:17:15 +01:00
ha_myisammrg.cc Many files: 2006-12-23 20:17:15 +01:00
ha_myisammrg.h Many files: 2006-12-23 20:17:15 +01:00
ha_ndbcluster.cc Many files: 2006-12-23 20:17:15 +01:00
ha_ndbcluster.h Many files: 2006-12-23 20:17:15 +01:00
handler.cc Many files: 2006-12-23 20:17:15 +01:00
handler.h Many files: 2006-12-23 20:17:15 +01:00
hash_filo.cc Many files: 2006-12-23 20:17:15 +01:00
hash_filo.h Many files: 2006-12-23 20:17:15 +01:00
hostname.cc Many files: 2006-12-23 20:17:15 +01:00
init.cc Many files: 2006-12-23 20:17:15 +01:00
item.cc Many files: 2006-12-23 20:17:15 +01:00
item.h Many files: 2006-12-23 20:17:15 +01:00
item_buff.cc Many files: 2006-12-23 20:17:15 +01:00
item_cmpfunc.cc Many files: 2006-12-23 20:17:15 +01:00
item_cmpfunc.h Many files: 2006-12-23 20:17:15 +01:00
item_create.cc Many files: 2006-12-23 20:17:15 +01:00
item_create.h Many files: 2006-12-23 20:17:15 +01:00
item_func.cc Many files: 2006-12-23 20:17:15 +01:00
item_func.h Many files: 2006-12-23 20:17:15 +01:00
item_geofunc.cc Many files: 2006-12-23 20:17:15 +01:00
item_geofunc.h Many files: 2006-12-23 20:17:15 +01:00
item_row.cc Many files: 2006-12-23 20:17:15 +01:00
item_row.h Many files: 2006-12-23 20:17:15 +01:00
item_strfunc.cc Many files: 2006-12-23 20:17:15 +01:00
item_strfunc.h Many files: 2006-12-23 20:17:15 +01:00
item_subselect.cc Many files: 2006-12-23 20:17:15 +01:00
item_subselect.h Many files: 2006-12-23 20:17:15 +01:00
item_sum.cc Many files: 2006-12-23 20:17:15 +01:00
item_sum.h Many files: 2006-12-23 20:17:15 +01:00
item_timefunc.cc Many files: 2006-12-23 20:17:15 +01:00
item_timefunc.h Many files: 2006-12-23 20:17:15 +01:00
item_uniq.cc Many files: 2006-12-23 20:17:15 +01:00
item_uniq.h Many files: 2006-12-23 20:17:15 +01:00
key.cc Many files: 2006-12-23 20:17:15 +01:00
lex.h Many files: 2006-12-23 20:17:15 +01:00
lex_symbol.h Many files: 2006-12-23 20:17:15 +01:00
lock.cc Many files: 2006-12-23 20:17:15 +01:00
log.cc Many files: 2006-12-23 20:17:15 +01:00
log_event.cc Many files: 2006-12-23 20:17:15 +01:00
log_event.h Many files: 2006-12-23 20:17:15 +01:00
Makefile.am Many files: 2006-12-23 20:17:15 +01:00
matherr.c Many files: 2006-12-23 20:17:15 +01:00
message.mc make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
mf_iocache.cc Many files: 2006-12-23 20:17:15 +01:00
my_decimal.cc Many files: 2006-12-23 20:17:15 +01:00
my_decimal.h Many files: 2006-12-23 20:17:15 +01:00
my_lock.c Many files: 2006-12-23 20:17:15 +01:00
mysql_priv.h Many files: 2006-12-23 20:17:15 +01:00
mysqld.cc Many files: 2006-12-23 20:17:15 +01:00
mysqld_suffix.h Many files: 2006-12-23 20:17:15 +01:00
net_serv.cc Many files: 2006-12-23 20:17:15 +01:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 2006-12-26 16:23:05 -08:00
opt_range.h Many files: 2006-12-23 20:17:15 +01:00
opt_sum.cc Many files: 2006-12-23 20:17:15 +01:00
parse_file.cc Many files: 2006-12-23 20:17:15 +01:00
parse_file.h Many files: 2006-12-23 20:17:15 +01:00
password.c Many files: 2006-12-23 20:17:15 +01:00
procedure.cc Many files: 2006-12-23 20:17:15 +01:00
procedure.h Many files: 2006-12-23 20:17:15 +01:00
protocol.cc Many files: 2006-12-23 20:17:15 +01:00
protocol.h Many files: 2006-12-23 20:17:15 +01:00
records.cc Many files: 2006-12-23 20:17:15 +01:00
repl_failsafe.cc Many files: 2006-12-23 20:17:15 +01:00
repl_failsafe.h Many files: 2006-12-23 20:17:15 +01:00
set_var.cc Many files: 2006-12-23 20:17:15 +01:00
set_var.h Many files: 2006-12-23 20:17:15 +01:00
slave.cc Many files: 2006-12-23 20:17:15 +01:00
slave.h Many files: 2006-12-23 20:17:15 +01:00
sp.cc Many files: 2006-12-23 20:17:15 +01:00
sp.h Many files: 2006-12-23 20:17:15 +01:00
sp_cache.cc Many files: 2006-12-23 20:17:15 +01:00
sp_cache.h Many files: 2006-12-23 20:17:15 +01:00
sp_head.cc Many files: 2006-12-23 20:17:15 +01:00
sp_head.h Many files: 2006-12-23 20:17:15 +01:00
sp_pcontext.cc Many files: 2006-12-23 20:17:15 +01:00
sp_pcontext.h Many files: 2006-12-23 20:17:15 +01:00
sp_rcontext.cc Many files: 2006-12-23 20:17:15 +01:00
sp_rcontext.h Many files: 2006-12-23 20:17:15 +01:00
spatial.cc Many files: 2006-12-23 20:17:15 +01:00
spatial.h Many files: 2006-12-23 20:17:15 +01:00
sql_acl.cc Many files: 2006-12-23 20:17:15 +01:00
sql_acl.h Many files: 2006-12-23 20:17:15 +01:00
sql_analyse.cc Many files: 2006-12-23 20:17:15 +01:00
sql_analyse.h Many files: 2006-12-23 20:17:15 +01:00
sql_array.h Many files: 2006-12-23 20:17:15 +01:00
sql_base.cc Many files: 2006-12-23 20:17:15 +01:00
sql_bitmap.h Many files: 2006-12-23 20:17:15 +01:00
sql_cache.cc Many files: 2006-12-23 20:17:15 +01:00
sql_cache.h Many files: 2006-12-23 20:17:15 +01:00
sql_class.cc Many files: 2006-12-23 20:17:15 +01:00
sql_class.h Many files: 2006-12-23 20:17:15 +01:00
sql_client.cc Many files: 2006-12-23 20:17:15 +01:00
sql_crypt.cc Many files: 2006-12-23 20:17:15 +01:00
sql_crypt.h Many files: 2006-12-23 20:17:15 +01:00
sql_cursor.cc Many files: 2006-12-23 20:17:15 +01:00
sql_cursor.h Many files: 2006-12-23 20:17:15 +01:00
sql_db.cc Many files: 2006-12-23 20:17:15 +01:00
sql_delete.cc Many files: 2006-12-23 20:17:15 +01:00
sql_derived.cc Many files: 2006-12-23 20:17:15 +01:00
sql_do.cc Many files: 2006-12-23 20:17:15 +01:00
sql_error.cc Many files: 2006-12-23 20:17:15 +01:00
sql_error.h Many files: 2006-12-23 20:17:15 +01:00
sql_handler.cc Many files: 2006-12-23 20:17:15 +01:00
sql_help.cc Many files: 2006-12-23 20:17:15 +01:00
sql_insert.cc Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 2006-12-26 16:23:05 -08:00
sql_lex.cc Many files: 2006-12-23 20:17:15 +01:00
sql_lex.h Many files: 2006-12-23 20:17:15 +01:00
sql_list.cc Many files: 2006-12-23 20:17:15 +01:00
sql_list.h Many files: 2006-12-23 20:17:15 +01:00
sql_load.cc Many files: 2006-12-23 20:17:15 +01:00
sql_locale.cc Many files: 2006-12-23 20:17:15 +01:00
sql_manager.cc Many files: 2006-12-23 20:17:15 +01:00
sql_manager.h Many files: 2006-12-23 20:17:15 +01:00
sql_map.cc Many files: 2006-12-23 20:17:15 +01:00
sql_map.h Many files: 2006-12-23 20:17:15 +01:00
sql_olap.cc Many files: 2006-12-23 20:17:15 +01:00
sql_parse.cc Merge xiphis.org:/home/antony/work2/mysql-5.0-engines 2006-12-26 16:23:05 -08:00
sql_prepare.cc Many files: 2006-12-23 20:17:15 +01:00
sql_rename.cc Many files: 2006-12-23 20:17:15 +01:00
sql_repl.cc Many files: 2006-12-23 20:17:15 +01:00
sql_repl.h Many files: 2006-12-23 20:17:15 +01:00
sql_select.cc Many files: 2006-12-23 20:17:15 +01:00
sql_select.h Many files: 2006-12-23 20:17:15 +01:00
sql_show.cc Many files: 2006-12-23 20:17:15 +01:00
sql_sort.h Many files: 2006-12-23 20:17:15 +01:00
sql_state.c Many files: 2006-12-23 20:17:15 +01:00
sql_string.cc Many files: 2006-12-23 20:17:15 +01:00
sql_string.h Many files: 2006-12-23 20:17:15 +01:00
sql_table.cc Many files: 2006-12-23 20:17:15 +01:00
sql_test.cc Many files: 2006-12-23 20:17:15 +01:00
sql_trigger.cc Many files: 2006-12-23 20:17:15 +01:00
sql_trigger.h Many files: 2006-12-23 20:17:15 +01:00
sql_udf.cc Many files: 2006-12-23 20:17:15 +01:00
sql_udf.h Many files: 2006-12-23 20:17:15 +01:00
sql_union.cc Many files: 2006-12-23 20:17:15 +01:00
sql_update.cc Many files: 2006-12-23 20:17:15 +01:00
sql_view.cc Many files: 2006-12-23 20:17:15 +01:00
sql_view.h Many files: 2006-12-23 20:17:15 +01:00
sql_yacc.yy Many files: 2006-12-23 20:17:15 +01:00
stacktrace.c Many files: 2006-12-23 20:17:15 +01:00
stacktrace.h Many files: 2006-12-23 20:17:15 +01:00
strfunc.cc Many files: 2006-12-23 20:17:15 +01:00
structs.h Many files: 2006-12-23 20:17:15 +01:00
table.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 2006-12-27 19:24:08 +01:00
table.h Many files: 2006-12-23 20:17:15 +01:00
thr_malloc.cc Many files: 2006-12-23 20:17:15 +01:00
time.cc Many files: 2006-12-23 20:17:15 +01:00
tzfile.h Many files: 2006-12-23 20:17:15 +01:00
tztime.cc Many files: 2006-12-23 20:17:15 +01:00
tztime.h Many files: 2006-12-23 20:17:15 +01:00
udf_example.c Many files: 2006-12-23 20:17:15 +01:00
udf_example.def Add the two new functions to udf_example.def so they will be exported by dll's 2006-11-16 16:19:29 +01:00
uniques.cc Many files: 2006-12-23 20:17:15 +01:00
unireg.cc Many files: 2006-12-23 20:17:15 +01:00
unireg.h Many files: 2006-12-23 20:17:15 +01:00
watchdog_mysqld