mariadb/sql
unknown 2d55dd5bbb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10539


sql/field.cc:
  Auto merged
2005-06-06 11:30:15 +05:00
..
examples Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
share
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-06 11:30:15 +05:00
field.h
field_conv.cc
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
ha_berkeley.h
ha_blackhole.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
ha_blackhole.h
ha_federated.cc sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc: 2005-06-05 16:20:22 +02:00
ha_federated.h Fix broken linking when building with ha_federated 2005-06-05 23:00:45 +04:00
ha_heap.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
ha_heap.h
ha_innodb.cc ha_innodb.cc: 2005-06-02 18:10:32 +03:00
ha_innodb.h
ha_myisam.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
ha_myisam.h
ha_myisammrg.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
ha_myisammrg.h
ha_ndbcluster.cc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-02 17:06:51 +02:00
ha_ndbcluster.h
handler.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
handler.h
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Give Item_arena::is_stmt_prepare a more descriptive name (it marks 2005-06-03 00:02:47 +04:00
item.h Post review fix of BUG#10969. 2005-06-03 12:56:51 +02:00
item_buff.cc
item_cmpfunc.cc Merge igor-inspiron.creware.com:/home/igor/mysql-5.0 2005-06-02 07:33:31 -07:00
item_cmpfunc.h item_func.h: 2005-06-02 07:27:02 -07:00
item_create.cc
item_create.h
item_func.cc yassl template instantiation - don't do too much 2005-06-03 13:43:17 +02:00
item_func.h item_func.h: 2005-06-02 10:00:32 -07:00
item_geofunc.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
item_strfunc.h
item_subselect.cc Give Item_arena::is_stmt_prepare a more descriptive name (it marks 2005-06-03 00:02:47 +04:00
item_subselect.h
item_sum.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
item_sum.h
item_timefunc.cc Merge 2005-06-06 10:39:21 +05:00
item_timefunc.h
item_uniq.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc
log.cc
log_event.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
log_event.h
Makefile.am
matherr.c
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h
mysqld.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc
opt_range.h Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
opt_sum.cc
parse_file.cc
parse_file.h
password.c
procedure.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
procedure.h
protocol.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
protocol.h
protocol_cursor.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
records.cc
repl_failsafe.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
repl_failsafe.h
set_var.cc Merge mysql.com:/usr/home/bar/mysql-4.1.sysvar 2005-06-02 17:13:37 +05:00
set_var.h
slave.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
slave.h
sp.cc
sp.h
sp_cache.cc sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc: 2005-06-05 16:20:22 +02:00
sp_cache.h
sp_head.cc sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc: 2005-06-05 16:20:22 +02:00
sp_head.h
sp_pcontext.cc sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc: 2005-06-05 16:20:22 +02:00
sp_pcontext.h
sp_rcontext.cc sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc: 2005-06-05 16:20:22 +02:00
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
sql_acl.h
sql_analyse.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
sql_analyse.h
sql_base.cc misc. fixes for windoze builds 2005-06-02 15:32:02 +02:00
sql_bitmap.h
sql_cache.cc
sql_cache.h
sql_class.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
sql_class.h Give Item_arena::is_stmt_prepare a more descriptive name (it marks 2005-06-03 00:02:47 +04:00
sql_client.cc
sql_crypt.cc
sql_crypt.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 Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
sql_lex.cc
sql_lex.h
sql_list.cc
sql_list.h
sql_load.cc
sql_manager.cc
sql_manager.h
sql_map.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
sql_map.h
sql_olap.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
sql_parse.cc Give Item_arena::is_stmt_prepare a more descriptive name (it marks 2005-06-03 00:02:47 +04:00
sql_prepare.cc
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-02 20:55:32 +02:00
sql_select.h
sql_show.cc
sql_sort.h
sql_state.c
sql_string.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
sql_string.h
sql_table.cc
sql_test.cc
sql_trigger.cc
sql_trigger.h
sql_udf.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
sql_udf.h
sql_union.cc Give Item_arena::is_stmt_prepare a more descriptive name (it marks 2005-06-03 00:02:47 +04:00
sql_update.cc
sql_view.cc
sql_view.h
sql_yacc.yy Post review fix of BUG#10969. 2005-06-03 12:56:51 +02:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc
table.h
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
tztime.h
udf_example.cc
uniques.cc
unireg.cc
unireg.h
watchdog_mysqld