mariadb/sql
unknown 5c1b91f1ee Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
2005-03-17 08:46:48 +01:00
..
examples print xa recovery progress 2005-03-13 21:58:09 +01:00
share WL#874 "Extended LOAD DATA". 2005-03-16 04:32:47 +03:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc Remove compiler warnings and remove not used variables 2005-02-25 16:53:22 +02:00
des_key_file.cc
discover.cc
field.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
field.h Cleanup during reviews 2005-03-16 16:11:01 +02:00
field_conv.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
filesort.cc merging 2005-03-15 19:31:52 +04:00
frm_crypt.cc
gen_lex_hash.cc After merge fixes 2004-12-31 00:44:00 +02:00
gstream.cc
gstream.h
ha_berkeley.cc Merge 4.1 - 5.0 2005-03-15 01:14:59 +02:00
ha_berkeley.h XA (not completely polished out yet) 2005-01-16 13:16:23 +01:00
ha_federated.cc Merge with global tree 2005-03-17 01:27:04 +02:00
ha_federated.h Chmod -x for ha_federated.h 2005-03-05 00:35:00 +03:00
ha_heap.cc after merge fix 2005-03-15 19:43:32 +04:00
ha_heap.h Output 'MEMORY' as table type for tables using the memory (nee heap) storage 2005-01-13 17:38:13 -08:00
ha_innodb.cc ha_innodb.cc: 2005-03-16 15:18:14 +02:00
ha_innodb.h Many files: 2005-03-16 00:34:15 +02:00
ha_myisam.cc Merge with after merge fix 2005-03-04 11:37:45 +01:00
ha_myisam.h Merge changes 2005-02-04 11:59:02 -08:00
ha_myisammrg.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
ha_myisammrg.h Fix for BUG#7377. This fix adds the same implementation for ha_myisammgr::index_type as in version 5.0. 2004-12-27 14:05:35 +02:00
ha_ndbcluster.cc Merged WL#2269 to mysql-5.0 2005-03-15 15:22:40 +01:00
ha_ndbcluster.h Merged WL#2269 to mysql-5.0 2005-03-15 15:22:40 +01:00
handler.cc Merge bk-internal:/home/bk/mysql-5.0 2005-03-17 08:46:48 +01:00
handler.h print xa recovery progress 2005-03-13 21:58:09 +01:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-03-13 23:53:30 +03:00
item.h WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) and 2005-03-13 23:50:43 +03:00
item_buff.cc Fixed failing test cases 'row.test' when running with --ps-protocol 2005-02-15 16:45:00 +02:00
item_cmpfunc.cc Fixes for bug#8115 "Server Crash with prepared statement" 2005-03-03 17:38:59 +03:00
item_cmpfunc.h merged 2005-03-14 18:46:30 +01:00
item_create.cc Merge 2005-03-05 18:20:35 +04:00
item_create.h Precision Math implementation 2005-02-09 02:50:45 +04:00
item_func.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-03-16 22:59:06 +02:00
item_func.h WL#874 "Extended LOAD DATA". 2005-03-16 04:32:47 +03:00
item_geofunc.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
item_geofunc.h Rename: Item::val -> Item::val_real(). 2004-11-11 21:39:35 +03:00
item_row.cc Merge with 4.1 2005-02-10 02:27:37 +02:00
item_row.h Precision Math implementation 2005-02-09 02:50:45 +04:00
item_strfunc.cc Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 2005-03-09 16:53:20 -08:00
item_strfunc.h Merge 2005-03-05 18:20:35 +04:00
item_subselect.cc Remove compiler warnings and remove not used variables 2005-02-25 16:53:22 +02:00
item_subselect.h Precision Math implementation 2005-02-09 02:50:45 +04:00
item_sum.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
item_sum.h WL#926 "AVG(DISTINCT) and other distincts", part 2 (out of 3): clean up 2005-03-15 03:46:19 +03:00
item_timefunc.cc Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and 2005-01-28 10:22:50 +03:00
item_timefunc.h Precision Math implementation 2005-02-09 02:50:45 +04:00
item_uniq.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
item_uniq.h Precision Math implementation 2005-02-09 02:50:45 +04:00
key.cc Fixes for windows compilation bugs 2005-01-26 15:19:20 +01:00
lex.h BUG#3190 fix (request for STDDEV_SAMP, VAR_SAMP). 2005-02-25 22:19:04 +04:00
lex_symbol.h
lock.cc Merge bk-internal:/home/bk/mysql-5.0 2005-03-17 08:46:48 +01:00
log.cc sql/log.cc 2005-03-14 17:53:24 +01:00
log_event.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-03-16 22:59:06 +02:00
log_event.h WL#874 "Extended LOAD DATA". 2005-03-16 04:32:47 +03:00
Makefile.am Precision Math implementation 2005-02-09 02:50:45 +04:00
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 bk-internal:/home/bk/mysql-5.0 2005-03-17 08:46:48 +01:00
mysqld.cc global read lock code now uses a dedicated mutex 2005-03-16 08:40:19 +01:00
mysqld_suffix.h
net_serv.cc Merge changes. 2005-03-08 17:24:07 +01:00
nt_servc.cc
nt_servc.h cleaned up mysql installation code for windows. 2005-02-09 22:02:48 +02:00
opt_range.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
opt_range.h Post WL#2126 fixes: 2004-12-29 16:07:27 +03:00
opt_sum.cc Merge 2005-03-05 18:20:35 +04:00
parse_file.cc now my_printf_error is not better then my_error, but my_error call is shorter 2004-11-13 19:35:51 +02:00
parse_file.h fixed & added comments (according to Igor's review and a bit more) 2004-10-07 01:45:06 +03:00
password.c Merge with 4.1 2004-12-22 13:54:39 +02:00
procedure.cc Precision Math implementation 2005-02-09 02:50:45 +04:00
procedure.h Merge with 4.1 2005-02-22 15:47:00 +02:00
protocol.cc after merge fixes 2005-03-09 19:22:30 +01:00
protocol.h Precision Math implementation 2005-02-09 02:50:45 +04:00
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 Merge 2005-01-20 07:51:00 +03:00
repl_failsafe.cc First stage of table definition cache 2005-01-06 13:00:13 +02:00
repl_failsafe.h merge 2004-11-12 15:36:31 +02:00
set_var.cc Merged WL#2269 to mysql-5.0 2005-03-15 15:22:40 +01:00
set_var.h Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 2005-02-18 12:02:46 +01:00
slave.cc Merge bk-internal:/home/bk/mysql-5.0 2005-03-09 13:02:51 +01:00
slave.h Merge 2005-03-02 14:46:19 +01:00
sp.cc More portability fixes 2005-03-10 19:42:57 +00:00
sp.h Better approach for prelocking of tables for stored routines execution 2005-03-04 16:35:28 +03:00
sp_cache.cc
sp_cache.h
sp_head.cc Merge with global tree 2005-03-15 16:21:08 +02:00
sp_head.h Merge in fix Bug#3788 2005-03-08 22:32:09 +00:00
sp_pcontext.cc Fixed BUG#8760: Stored Procedures: Invalid SQLSTATE is allowed in 2005-02-28 18:07:06 +01:00
sp_pcontext.h Fixed BUG#8760: Stored Procedures: Invalid SQLSTATE is allowed in 2005-02-28 18:07:06 +01:00
sp_rcontext.cc Manual merge SP-locking improvements patch with current tree. 2005-03-04 17:46:45 +03:00
sp_rcontext.h Better approach for prelocking of tables for stored routines execution 2005-03-04 16:35:28 +03:00
spatial.cc Fix for bug #6117 (Centroid() crashes server) 2004-10-22 20:32:02 +05:00
spatial.h Fix compiler warnings (detected by Intel's C++ compiler) 2004-10-22 18:44:51 +03:00
sql_acl.cc Fixed two bugs in MySQL ACL. 2005-03-17 08:16:56 +02:00
sql_acl.h Code cleanups during review of pushed code 2005-03-15 16:07:28 +02:00
sql_analyse.cc Remove compiler warnings and remove not used variables 2005-02-25 16:53:22 +02:00
sql_analyse.h Precision Math implementation 2005-02-09 02:50:45 +04:00
sql_base.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_bitmap.h
sql_cache.cc postreview changes 2005-02-21 17:07:40 +02:00
sql_cache.h merge 2005-02-07 21:39:37 +02:00
sql_class.cc Fix complilation failure 2005-03-09 20:49:44 +01:00
sql_class.h Merged WL#2269 to mysql-5.0 2005-03-15 15:22:40 +01:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc merge with 4.1 2005-02-28 12:18:39 +02:00
sql_delete.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_derived.cc Merge with 4.1 2005-02-22 15:47:00 +02:00
sql_do.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
sql_error.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_handler.cc Better approach for prelocking of tables for stored routines execution 2005-03-04 16:35:28 +03:00
sql_help.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_insert.cc Fix for sp.test failure in --ps-protocol mode (2nd attempt). 2005-03-10 16:05:48 +03:00
sql_lex.cc Manual merge SP-locking improvements patch with current tree. 2005-03-04 17:46:45 +03:00
sql_lex.h WL#874 "Extended LOAD DATA". 2005-03-16 04:32:47 +03:00
sql_list.cc
sql_list.h Merge with 4.1 2005-02-15 17:12:13 +02:00
sql_load.cc Fixed behavior of LOAD DATA with subqueries in SET clause. 2005-03-16 12:13:35 +03:00
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 post-merge fix 2004-11-25 02:23:13 +02:00
sql_parse.cc Merge bk-internal:/home/bk/mysql-5.0 2005-03-17 08:46:48 +01:00
sql_prepare.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_rename.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_repl.cc WL#874 "Extended LOAD DATA". 2005-03-16 04:32:47 +03:00
sql_repl.h WL#874 "Extended LOAD DATA". 2005-03-16 04:32:47 +03:00
sql_select.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_select.h WL#926 "SUM(DISTINCT) and AVG(DISTINCT)": improvement of SUM(DISTINCT) and 2005-03-13 23:50:43 +03:00
sql_show.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_sort.h
sql_state.c
sql_string.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_string.h Fixing failing -debug build. 2005-02-15 22:06:55 +03:00
sql_table.cc Merge bk-internal:/home/bk/mysql-5.0 2005-03-17 08:46:48 +01:00
sql_test.cc Fixed Bug#8042, "mysqld crashes on sighup". 2005-02-17 14:07:28 +02:00
sql_trigger.cc Fix for yet another memleak caused by SP-locking patch. 2005-03-05 16:31:58 +03:00
sql_trigger.h Better approach for prelocking of tables for stored routines execution 2005-03-04 16:35:28 +03:00
sql_udf.cc Code cleanups during review of pushed code 2005-03-15 16:07:28 +02:00
sql_udf.h Precision Math implementation 2005-02-09 02:50:45 +04:00
sql_union.cc manual merge 2005-03-03 14:29:37 +04:00
sql_update.cc Fixed two bugs in MySQL ACL. 2005-03-17 08:16:56 +02:00
sql_view.cc Fix for memory leak which was introduced by patch improving locking in SP. 2005-03-04 20:54:24 +03:00
sql_view.h post-merge fix 2004-11-25 02:23:13 +02:00
sql_yacc.yy Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-03-16 22:59:06 +02:00
stacktrace.c Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
stacktrace.h
strfunc.cc Remove compiler warnings and remove not used variables 2005-02-25 16:53:22 +02:00
structs.h Manual merge of patch implementing WL#1339 with main tree. 2004-12-29 22:35:16 +03:00
table.cc Code cleanups during review of pushed code 2005-03-15 16:07:28 +02:00
table.h Manual merge SP-locking improvements patch with current tree. 2005-03-04 17:46:45 +03:00
thr_malloc.cc Simpler arena swapping code 2004-11-08 01:13:54 +02:00
time.cc Fix for bug #7297 "Two digit year should be interpreted correctly 2004-12-16 16:31:50 +03:00
tzfile.h
tztime.cc Better approach for prelocking of tables for stored routines execution 2005-03-04 16:35:28 +03:00
tztime.h Merge with global tree 2004-12-31 00:50:30 +02:00
udf_example.cc Merge with 4.1 2004-12-22 13:54:39 +02:00
uniques.cc
unireg.cc Bug#3788 2005-03-04 21:14:35 +00:00
unireg.h Merge with 4.1 to get bug fix 2005-02-07 19:42:03 +02:00
watchdog_mysqld