mariadb/sql
unknown 2f7fde4877 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-02-24 20:57:32 +01:00
..
examples Fix confusing comments. 2005-02-20 22:52:28 +03:00
share Fix badly spelled symbol. 2005-02-23 13:15:03 -06:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Merge with 4.1 2005-02-22 15:47:00 +02:00
field.h
field_conv.cc
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc windows compilation fixes 2005-02-19 12:15:30 +01:00
ha_berkeley.h
ha_federated.cc Fix confusing comments. 2005-02-20 22:52:28 +03:00
ha_federated.h compilation fixes 2005-02-18 14:42:14 +01:00
ha_heap.cc
ha_heap.h
ha_innodb.cc copy-paste fixed 2005-02-22 18:45:19 +01:00
ha_innodb.h
ha_myisam.cc
ha_myisam.h
ha_myisammrg.cc
ha_myisammrg.h
ha_ndbcluster.cc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2005-02-24 20:57:32 +01:00
ha_ndbcluster.h Fixes for condition pushdown to storage engine based on comments from code review 2005-02-23 15:51:26 +01:00
handler.cc compatibility fixes, crashing tests 2005-02-22 15:22:37 +01:00
handler.h merge 2005-02-24 06:24:46 +01:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 2005-02-23 19:22:52 +02:00
item.h Backport my_strntod() from 5.0 2005-02-22 12:51:23 +02:00
item_buff.cc
item_cmpfunc.cc
item_cmpfunc.h
item_create.cc
item_create.h
item_func.cc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2005-02-23 15:54:22 +01:00
item_func.h Backport my_strntod() from 5.0 2005-02-22 12:51:23 +02:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Merge gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-4.1 2005-02-23 18:47:00 +03:00
item_strfunc.h
item_subselect.cc
item_subselect.h
item_sum.cc Backport my_strntod() from 5.0 2005-02-22 12:51:23 +02:00
item_sum.h After merge fixes 2005-02-22 18:30:40 +02:00
item_timefunc.cc
item_timefunc.h
item_uniq.cc
item_uniq.h
key.cc
lex.h
lex_symbol.h
lock.cc Merge mysql.com:/home/mysql_src/mysql-4.1-clean 2005-02-23 18:52:15 +01:00
log.cc Bug#8412: merged from 4.1 2005-02-23 23:01:51 +01:00
log_event.cc Merge bk-internal:/home/bk/mysql-5.0 2005-02-23 20:10:58 +01:00
log_event.h don't log BEGIN in auto-commit mode 2005-02-23 18:26:49 +01:00
Makefile.am
matherr.c
mf_iocache.cc
my_decimal.cc use dbug_print_decimal instead of DBUG_EXECUTE 2005-02-20 00:24:30 +02:00
my_decimal.h More changes to make 5.0.3 compile on Windows 2005-02-23 22:55:46 -06:00
my_lock.c
mysql_priv.h Merge 4.1->5.0 2005-02-22 22:40:34 +01:00
mysqld.cc Merge 2005-02-24 14:48:12 +01:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc Fix for BUG#8576 2005-02-23 20:49:47 +02:00
opt_range.h
opt_sum.cc
parse_file.cc
parse_file.h
password.c
procedure.cc
procedure.h Merge with 4.1 2005-02-22 15:47:00 +02:00
protocol.cc Fixed BUG#8638: Test 'sp' fails: Stored Procedure often sends warning 1329 2005-02-24 13:56:09 +01:00
protocol.h
protocol_cursor.cc Fixed BUILD script to use --with-berkeley-db instead of --with-bdb 2005-02-19 18:58:27 +02:00
records.cc
repl_failsafe.cc
repl_failsafe.h
set_var.cc merge 2005-02-24 06:24:46 +01:00
set_var.h
slave.cc
slave.h
sp.cc
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc A minor adjustment of the previous bug fix in sp_head.cc. 2005-02-21 14:57:43 +01:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc Fixed BUILD script to use --with-berkeley-db instead of --with-bdb 2005-02-19 18:58:27 +02:00
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc Merge 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 2005-02-23 19:22:52 +02:00
sql_acl.h
sql_analyse.cc Fixed BUILD script to use --with-berkeley-db instead of --with-bdb 2005-02-19 18:58:27 +02:00
sql_analyse.h
sql_base.cc Review of new pushed code (XA & other) 2005-02-21 14:47:57 +02:00
sql_bitmap.h
sql_cache.cc postreview changes 2005-02-21 17:07:40 +02:00
sql_cache.h
sql_class.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-02-19 19:00:41 +02:00
sql_class.h merge 2005-02-24 06:24:46 +01:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0 2005-02-22 14:52:26 +02:00
sql_delete.cc
sql_derived.cc Merge with 4.1 2005-02-22 15:47:00 +02:00
sql_do.cc
sql_error.cc Manual merge 4.1->5.0 2005-02-22 22:42:49 +01:00
sql_handler.cc
sql_help.cc
sql_insert.cc
sql_lex.cc
sql_lex.h
sql_list.cc
sql_list.h
sql_load.cc
sql_manager.cc
sql_manager.h
sql_map.cc A fix (mysql_priv.h should be included first) 2005-02-24 12:17:59 +04:00
sql_map.h
sql_olap.cc
sql_parse.cc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2005-02-24 20:57:32 +01:00
sql_prepare.cc
sql_rename.cc
sql_repl.cc Review of new pushed code (XA & other) 2005-02-21 14:47:57 +02:00
sql_repl.h
sql_select.cc Merge 2005-02-24 14:48:12 +01:00
sql_select.h
sql_show.cc Fix for bug #7217: information_schema: columns are varbinary() instead of timestamp & 2005-02-23 15:15:36 +03:00
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Generate warning in ha_delete_table() if files is missing in handler 2005-02-21 20:41:48 +02:00
sql_test.cc
sql_trigger.cc
sql_trigger.h
sql_udf.cc
sql_udf.h
sql_union.cc
sql_update.cc Merge with 4.1 2005-02-22 15:47:00 +02:00
sql_view.cc
sql_view.h
sql_yacc.yy Merge with 4.1 2005-02-22 15:47:00 +02:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc Post review changes 2005-02-23 18:51:10 +02:00
table.h
thr_malloc.cc
time.cc
tzfile.h
tztime.cc
tztime.h
udf_example.cc
uniques.cc
unireg.cc
unireg.h
watchdog_mysqld