mariadb/sql
unknown 98afd8b5c7 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug11459
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge


sql/ha_ndbcluster.cc:
  Auto merged
2006-06-28 18:21:37 +10:00
..
share Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-06-21 17:51:54 +02:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-26 18:45:46 +04:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_scheduler.cc manual merge 2006-06-20 17:14:36 +02:00
event_scheduler.h Reorganize, physically the events code 2006-06-08 23:07:11 +02:00
event_timed.cc Reorganize, physically the events code 2006-06-08 23:07:11 +02:00
event_timed.h forgot to event_timed.h 2006-06-20 17:05:41 +02:00
events.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-26 18:45:46 +04:00
events.h Reorganize, physically the events code 2006-06-08 23:07:11 +02:00
events_priv.h Reorganize, physically the events code 2006-06-08 23:07:11 +02:00
field.cc Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 2006-06-25 09:59:34 -04:00
field.h Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 2006-06-25 09:59:34 -04:00
field_conv.cc
filesort.cc unsigned char -> uchar 2006-06-19 12:45:34 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc Fixed some issues found by valgrind 2006-06-06 02:47:30 +03:00
ha_berkeley.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_federated.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_federated.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_heap.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_heap.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_innodb.cc Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 2006-06-23 17:27:54 -04:00
ha_innodb.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_myisam.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_myisam.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_myisammrg.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
ha_myisammrg.h Merge mysql.com:/home/mydev/mysql-5.0-amerge 2006-06-15 10:58:02 +02:00
ha_ndbcluster.cc Merge mysql.com:/home/stewart/Documents/MySQL/5.0/bug11459 2006-06-28 18:21:37 +10:00
ha_ndbcluster.h partition functions to pass create_info, not only max_rows 2006-06-27 22:19:27 +02:00
ha_ndbcluster_binlog.cc Bug #20705 table truncation from one mysqld causes ERROR 1412 on other mysqld servers 2006-06-28 02:35:13 +02:00
ha_ndbcluster_binlog.h sql_delete.cc: 2006-06-12 14:23:21 +02:00
ha_ndbcluster_tables.h
ha_partition.cc Merge dator5.(none):/home/pappa/clean-mysql-5.1 2006-06-20 10:08:30 -04:00
ha_partition.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
handler.cc Fixed memory leak (found by rpl_row_inexist_tbl) 2006-06-23 10:35:45 +03:00
handler.h partition functions to pass create_info, not only max_rows 2006-06-27 22:19:27 +02:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
item.h Manually merged 2006-06-18 14:56:35 +04:00
item_buff.cc Fix for bug#19667 group by a decimal expression yields wrong result 2006-06-15 16:24:02 +05:00
item_cmpfunc.cc Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 2006-06-25 09:59:34 -04:00
item_cmpfunc.h Manually merged 2006-06-18 14:56:35 +04:00
item_create.cc
item_create.h
item_func.cc Manually merged 2006-06-18 14:56:35 +04:00
item_func.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
item_geofunc.cc
item_geofunc.h
item_row.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
item_row.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
item_strfunc.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-19 13:00:36 +03:00
item_strfunc.h post-merge fix 2006-06-14 10:54:56 +05:00
item_subselect.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
item_subselect.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
item_sum.cc String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
item_sum.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
item_timefunc.cc Manually merged 2006-06-18 14:56:35 +04:00
item_timefunc.h Manually merged 2006-06-18 14:56:35 +04:00
item_uniq.cc
item_uniq.h
item_xmlfunc.cc Merge mysql.com:/usr/home/bar/mysql-5.1-new.b18201 2006-06-19 11:18:05 +05:00
item_xmlfunc.h
key.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
lex.h
lex_symbol.h
lock.cc Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 2006-06-12 17:41:05 -04:00
log.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-06-21 17:51:54 +02:00
log.h after merge fixes 2006-06-21 14:53:40 +05:00
log_event.cc Fixed memory leak (found by rpl_row_inexist_tbl) 2006-06-23 10:35:45 +03:00
log_event.h Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2006-06-15 15:38:14 +04:00
Makefile.am add event_timed.h also to the distribution 2006-06-21 08:58:56 +02:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-26 18:45:46 +04:00
mysqld.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-26 18:45:46 +04:00
mysqld_suffix.h
net_serv.cc configure.in, net_serv.cc, compile-netware-END: 2006-06-17 00:30:02 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-19 13:00:36 +03:00
opt_range.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
opt_sum.cc Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 2006-06-25 09:59:34 -04:00
parse_file.cc
parse_file.h
partition_element.h Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 2006-06-14 09:12:07 -04:00
partition_info.cc partition functions to pass create_info, not only max_rows 2006-06-27 22:19:27 +02:00
partition_info.h partition functions to pass create_info, not only max_rows 2006-06-27 22:19:27 +02:00
password.c
procedure.cc
procedure.h String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
protocol.cc String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
protocol.h
records.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
repl_failsafe.cc
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2 2006-06-23 15:05:15 +02:00
rpl_injector.h Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2 2006-06-23 15:05:15 +02:00
rpl_rli.h Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2006-06-07 23:58:08 +04:00
rpl_tblmap.cc
rpl_tblmap.h
set_var.cc Remove compiler warnings 2006-06-23 02:49:19 +03:00
set_var.h Remove compiler warnings 2006-06-23 02:49:19 +03:00
slave.cc Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 2006-06-25 09:59:34 -04:00
slave.h
sp.cc String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Merge mysql.com:/opt/local/work/tmp_merge 2006-06-26 18:49:20 +04:00
sp_head.h
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
spatial.h
sql_acl.cc String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
sql_acl.h
sql_analyse.cc String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
sql_analyse.h String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
sql_array.h
sql_base.cc Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 2006-06-19 20:26:36 +03:00
sql_binlog.cc
sql_bitmap.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_builtin.cc.in
sql_cache.cc
sql_cache.h
sql_class.cc Merge mysql.com:/usr/local/mysql/mysql-5.1-bug20549 2006-06-26 11:26:24 +02:00
sql_class.h Fixed problem when compiling libmysqld (without replication) 2006-06-23 03:21:12 +03:00
sql_client.cc
sql_crypt.cc unsigned char -> uchar 2006-06-19 12:45:34 +03:00
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc manual merge 2006-06-20 17:14:36 +02:00
sql_delete.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-06-21 17:51:54 +02:00
sql_derived.cc
sql_do.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_error.cc
sql_error.h
sql_handler.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_help.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_insert.cc Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-22 15:26:08 +02:00
sql_lex.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-22 12:21:41 +03:00
sql_lex.h SHOW STATUS does not anymore change local status variables (except com_show_status). Global status variables are still updated. 2006-06-20 13:20:32 +03:00
sql_list.cc
sql_list.h
sql_load.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_parse.cc Merge mysql.com:/opt/local/work/tmp_merge 2006-06-26 18:49:20 +04:00
sql_partition.cc partition functions to pass create_info, not only max_rows 2006-06-27 22:19:27 +02:00
sql_partition.h partition functions to pass create_info, not only max_rows 2006-06-27 22:19:27 +02:00
sql_plugin.cc Bug#20168 2006-06-12 06:50:11 -07:00
sql_plugin.h Bug#20168 2006-06-12 06:50:11 -07:00
sql_prepare.cc SHOW STATUS does not anymore change local status variables (except com_show_status). Global status variables are still updated. 2006-06-20 13:20:32 +03:00
sql_rename.cc
sql_repl.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_repl.h
sql_select.cc Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge 2006-06-25 09:59:34 -04:00
sql_select.h Manually merged 2006-06-18 14:56:35 +04:00
sql_show.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-26 18:45:46 +04:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-19 13:00:36 +03:00
sql_string.h String::set(double) and set(longlong) -> set_real() and set_int() 2006-06-16 12:17:20 +02:00
sql_table.cc partition functions to pass create_info, not only max_rows 2006-06-27 22:19:27 +02:00
sql_tablespace.cc Bug#20168 2006-06-12 06:50:11 -07:00
sql_test.cc
sql_trigger.cc
sql_trigger.h This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_udf.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_udf.h
sql_union.cc This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
sql_update.cc Merge may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0 2006-06-20 16:45:51 +05:00
sql_view.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
sql_view.h
sql_yacc.yy Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-06-26 18:45:46 +04:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h SHOW STATUS does not anymore change local status variables (except com_show_status). Global status variables are still updated. 2006-06-20 13:20:32 +03:00
table.cc BUG#16000: .par file not removed plus errors to error log for normal errors 2006-06-20 13:24:30 -04:00
table.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-06-04 21:05:22 +03:00
thr_malloc.cc
time.cc manual merge 2006-06-20 17:14:36 +02:00
tzfile.h
tztime.cc unsigned char -> uchar 2006-06-19 12:45:34 +03:00
tztime.h
udf_example.cc
uniques.cc
unireg.cc BUG#16000: .par file not removed plus errors to error log for normal errors 2006-06-20 13:24:30 -04:00
unireg.h