mariadb/sql
unknown 16bca98267 Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984
into  mysql.com:/home/alik/MySQL/devel/5.1-wl2984-merge


mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
BitKeeper/deleted/.del-type_newdecimal-big.result:
  Auto merged
BitKeeper/deleted/.del-type_newdecimal-big.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
sql/field.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/field.cc:
  Merge.
sql/sp_head.cc:
  Merge.
sql/sql_select.cc:
  Merge.
2005-12-09 15:14:19 +03:00
..
examples Merge mysql.com:/usr/local/bk/mysql-5.0 2005-11-28 20:14:12 +01:00
share Post-merge fix of sql/share/errmsg.txt 2005-12-07 15:22:01 +01:00
.cvsignore
add_errmsg
authors.h Merge mysql.com:/home/jimw/my/mysql-5.1-release 2005-11-30 13:51:23 -08:00
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc Many files: 2005-09-30 14:03:55 +02:00
discover.cc
field.cc Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
field.h Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
field_conv.cc Fix for bug#11491 Misleading error message if not NULL column set to NULL, 2005-12-01 15:30:11 +04:00
filesort.cc Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects 2005-10-14 00:04:52 +03:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_archive.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
ha_archive.h Table definition cache, part 2 2005-11-23 22:45:02 +02:00
ha_berkeley.cc Merge mysql.com:/home/jimw/my/mysql-5.1-14880 2005-12-05 18:09:42 -08:00
ha_berkeley.h Merge mysql.com:/home/jimw/my/mysql-5.1-14880 2005-12-05 18:09:42 -08:00
ha_blackhole.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
ha_blackhole.h BUG#15406: Adding support for transactions to blackhole. 2005-12-02 01:11:49 +01:00
ha_federated.cc BUG #15559 2005-12-07 12:58:04 -08:00
ha_federated.h Table definition cache, part 2 2005-11-23 22:45:02 +02:00
ha_heap.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
ha_heap.h Table definition cache, part 2 2005-11-23 22:45:02 +02:00
ha_innodb.cc The innodb-5.0-ss52 snapshot changes were erroneously auto-merged 2005-12-08 15:00:18 +03:00
ha_innodb.h The innodb-5.0-ss52 snapshot changes were erroneously auto-merged 2005-12-08 15:00:18 +03:00
ha_myisam.cc Many files: 2005-12-01 13:34:48 +01:00
ha_myisam.h Table definition cache, part 2 2005-11-23 22:45:02 +02:00
ha_myisammrg.cc Merge mysql.com:/home/my/mysql-5.1 2005-11-23 22:58:53 +02:00
ha_myisammrg.h Table definition cache, part 2 2005-11-23 22:45:02 +02:00
ha_ndbcluster.cc Merge mysql.com:/usr/local/bk/mysql-5.0 2005-11-28 20:14:12 +01:00
ha_ndbcluster.h Made set_part_info a handler method and not a ha_partition method only 2005-11-25 09:11:52 +01:00
ha_partition.cc Makefile.am: 2005-11-26 05:35:37 +01:00
ha_partition.h Made set_part_info a handler method and not a ha_partition method only 2005-11-25 09:11:52 +01:00
handler.cc Merge mysql.com:/home/my/mysql-5.1 2005-11-24 06:23:51 +02:00
handler.h Merge mysql.com:/usr/local/bk/mysql-5.0 2005-11-28 20:14:12 +01:00
handlerton-win.cc Makefile.am: 2005-11-26 05:35:37 +01:00
handlerton.cc.in Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
item.h Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
item_buff.cc
item_cmpfunc.cc Merge mysql.com:/home/jimw/my/mysql-5.0-clean 2005-12-01 15:14:51 -08:00
item_cmpfunc.h fix for bug #12595 (ESCAPE must be exactly 1 character long) 2005-10-21 04:01:52 +03:00
item_create.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
item_create.h
item_func.cc Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
item_func.h Patch for WL#2894: Make stored routine variables work 2005-12-07 17:01:17 +03:00
item_geofunc.cc Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 2005-10-31 11:54:36 +02:00
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Merge mysql.com:/usr/home/bar/mysql-4.1.b10446 2005-11-29 09:25:51 +04:00
item_strfunc.h Merge mysql.com:/usr/home/bar/mysql-4.1.b10446 2005-11-29 09:25:51 +04:00
item_subselect.cc Merge mysql.com:/home/my/mysql-5.1 2005-11-23 22:58:53 +02:00
item_subselect.h A fix and a test case for Bug#12736 "Server crash during a select". 2005-10-13 11:53:00 +04:00
item_sum.cc Merge mysql.com:/usr/local/bk/mysql-5.0 2005-12-02 18:43:08 +01:00
item_sum.h Addition to fix for bug #12956: cast make differ rounding. 2005-11-30 11:17:25 +04:00
item_timefunc.cc Merge mysql.com:/home/my/mysql-5.1 2005-11-23 22:58:53 +02:00
item_timefunc.h Table definition cache, part 2 2005-11-23 22:45:02 +02:00
item_uniq.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
item_uniq.h Inefficient usage of String::append() fixed. 2005-11-20 20:47:07 +02:00
key.cc Merge mysql.com:/home/my/mysql-5.1 2005-11-23 22:58:53 +02:00
lex.h Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2005-11-23 14:57:00 +02:00
lex_symbol.h
lock.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
log.cc Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2005-11-23 14:57:00 +02:00
log_event.cc Minor Win32 compile fixes for 4.1.16 release. 2005-11-28 15:07:20 +01:00
log_event.h Fixes during review of pushed code 2005-10-27 15:15:01 +03:00
Makefile.am Makefile.am: 2005-11-26 05:35:37 +01:00
matherr.c
mf_iocache.cc
my_decimal.cc Moved long running query to type_newdecimal-big.test 2005-11-23 20:16:06 +02:00
my_decimal.h Fix for bug #13573 (wrong data inserted for too big decimals) 2005-10-15 21:57:32 +05:00
my_lock.c
mysql_priv.h Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
mysqld.cc mysqld.cc: 2005-12-06 13:21:29 -06:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc Merge mysql.com:/home/mydev/mysql-5.0-bug10932 2005-12-06 08:31:38 +01:00
opt_range.h BUG#121915: Merge 4.1->5.0 2005-10-19 01:52:06 +04:00
opt_sum.cc Merge 2005-10-06 10:54:07 +02:00
parse_file.cc Merge mysql.com:/home/my/mysql-5.1 2005-11-23 22:58:53 +02:00
parse_file.h Inefficient usage of String::append() fixed. 2005-11-20 20:47:07 +02:00
password.c Reviewing new pushed code 2005-10-12 00:58:22 +03:00
procedure.cc
procedure.h
protocol.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0 2005-11-23 00:58:13 +02:00
protocol.h Fix for BUG#13549 "Server crash with nested stored procedures 2005-11-23 00:50:37 +02:00
records.cc Many files: 2005-12-01 13:34:48 +01:00
repl_failsafe.cc Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2005-11-23 14:57:00 +02:00
repl_failsafe.h pthread_handler_decl() changed to be ctags-friendly 2005-10-08 16:39:55 +02:00
rpl_filter.cc Fix for BUG#15018 "valgrind error in Rpl_filter (uninitalized memory - could crash)". 2005-11-17 15:58:55 +01:00
rpl_filter.h Fix for BUG#15018 "valgrind error in Rpl_filter (uninitalized memory - could crash)". 2005-11-17 15:58:55 +01:00
set_var.cc mysqld.cc: 2005-12-06 13:21:29 -06:00
set_var.h Merge mysql.com:/home/mysql_src/mysql-5.0 2005-11-18 16:38:01 +01:00
slave.cc Merge mysql.com:/home/my/mysql-5.1 2005-11-24 04:08:07 +02:00
slave.h Merge mysql.com:/home/my/mysql-5.0 2005-11-05 01:32:55 +02:00
sp.cc Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
sp.h Merge mysql.com:/usr/local/bk/mysql-5.0 2005-12-06 13:34:18 +01:00
sp_cache.cc Fix use of "%*s" *printf() specifiers that were really meant to be 2005-10-06 17:37:24 -07:00
sp_cache.h
sp_head.cc Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
sp_head.h Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
sp_pcontext.cc Patch for WL#2894: Make stored routine variables work 2005-12-07 17:01:17 +03:00
sp_pcontext.h Patch for WL#2894: Make stored routine variables work 2005-12-07 17:01:17 +03:00
sp_rcontext.cc Patch for WL#2894: Make stored routine variables work 2005-12-07 17:01:17 +03:00
sp_rcontext.h Patch for WL#2894: Make stored routine variables work 2005-12-07 17:01:17 +03:00
spatial.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0 2005-11-21 21:15:48 +02:00
spatial.h fix --ansi --pedantic compilation failure 2005-11-04 16:17:43 +03:00
sql_acl.cc Fixed compile error in sql_acl.cc. 2005-12-07 12:58:33 +01:00
sql_acl.h Merge mysql.com:/home/timka/mysql/src/5.0-2486 2005-12-07 10:47:43 +02:00
sql_analyse.cc Inefficient usage of String::append() fixed. 2005-11-20 20:47:07 +02:00
sql_analyse.h
sql_array.h
sql_base.cc Merge mysql.com:/home/timka/mysql/src/5.0-2486 2005-12-07 10:47:43 +02:00
sql_bitmap.h
sql_cache.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2005-12-03 08:56:00 +02:00
sql_cache.h Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2005-11-23 14:57:00 +02:00
sql_class.cc Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
sql_class.h Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc A fix for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA when 2005-11-19 19:00:02 +03:00
sql_cursor.h A fix and a test case for Bug#6513 "Test Suite: Values inserted by using 2005-09-22 02:11:21 +04:00
sql_db.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
sql_delete.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
sql_derived.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
sql_do.cc
sql_error.cc Additional fix for BUG#7049, after review. 2005-10-17 15:07:47 +02:00
sql_error.h
sql_handler.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
sql_help.cc Merge mysql.com:/home/my/mysql-5.0 2005-11-05 01:32:55 +02:00
sql_insert.cc Merge mysql.com:/home/timka/mysql/src/5.0-2486 2005-12-07 10:47:43 +02:00
sql_lex.cc Merge mysql.com:/home/timka/mysql/src/5.0-2486 2005-12-07 10:47:43 +02:00
sql_lex.h Merge mysql.com:/home/timka/mysql/src/5.0-2486 2005-12-07 10:47:43 +02:00
sql_list.cc
sql_list.h WL#2486 - Natural/using join according to SQL:2003. 2005-11-28 21:57:50 +02:00
sql_load.cc Merge mysql.com:/home/my/mysql-5.1 2005-11-23 22:58:53 +02:00
sql_manager.cc Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
sql_manager.h Make storage engines "pluggable", handlerton work 2005-11-07 16:25:06 +01:00
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
sql_partition.cc Makefile.am: 2005-11-26 05:35:37 +01:00
sql_plugin.cc More Win32 byte* vs. char* fixes. 2005-11-29 15:18:31 +01:00
sql_plugin.h Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree) 2005-11-05 13:20:35 +02:00
sql_prepare.cc Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2005-11-23 14:57:00 +02:00
sql_rename.cc Changes in get_table_type() and mysql_frm_type(). The main problem was 2005-11-03 16:10:11 +02:00
sql_repl.cc Merge mysql.com:/home/mysql_src/mysql-5.0 2005-11-18 16:38:01 +01:00
sql_repl.h
sql_select.cc Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
sql_select.h Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
sql_show.cc Fix for bug#9785 SELECT privilege for the whole database 2005-12-01 13:04:19 +04:00
sql_sort.h
sql_state.c
sql_string.cc Inefficient usage of String::append() fixed. 2005-11-20 20:47:07 +02:00
sql_string.h Inefficient usage of String::append() fixed. 2005-11-20 20:47:07 +02:00
sql_table.cc Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0 2005-12-07 15:17:18 +01:00
sql_test.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
sql_trigger.cc Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
sql_trigger.h Merge mysql.com:/usr/local/bk/mysql-5.0 2005-12-06 13:34:18 +01:00
sql_udf.cc Merge mysql.com:/home/my/mysql-5.0 2005-11-24 02:56:12 +02:00
sql_udf.h
sql_union.cc A fix and a test case for Bug#12736 "Server crash during a select". 2005-10-13 11:53:00 +04:00
sql_update.cc Merge moonbone.local:/work/15028-bug-5.0-mysql 2005-12-02 22:07:10 +03:00
sql_view.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2005-12-03 08:56:00 +02:00
sql_view.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-11-03 16:43:05 +02:00
sql_yacc.yy Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984 2005-12-09 15:14:19 +03:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h Merge mysql.com:/home/my/mysql-5.1 2005-11-23 22:58:53 +02:00
table.cc Merge mysql.com:/home/timka/mysql/src/5.0-2486 2005-12-07 10:47:43 +02:00
table.h Merge mysql.com:/home/timka/mysql/src/5.0-2486 2005-12-07 10:47:43 +02:00
thr_malloc.cc
time.cc Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE 2005-12-02 15:01:44 +04:00
tzfile.h
tztime.cc Merge mysql.com:/home/my/mysql-5.0 2005-11-24 02:56:12 +02:00
tztime.h
udf_example.cc
uniques.cc
unireg.cc Table definition cache, part 2 2005-11-23 22:45:02 +02:00
unireg.h Merge mysql.com:/home/mydev/mysql-5.0-bug10932 2005-12-06 08:31:38 +01:00
watchdog_mysqld