mariadb/sql
unknown d27a709f3d merged
BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
scripts/fill_func_tables.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
2005-03-23 09:42:24 +01:00
..
examples print xa recovery progress 2005-03-13 21:58:09 +01:00
share - Added new error message. 2005-03-22 15:57:24 +02: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 merged 2005-03-23 09:42:24 +01:00
field.h Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
field_conv.cc
filesort.cc merging 2005-03-15 19:31:52 +04:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_berkeley.cc Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
ha_berkeley.h
ha_federated.cc sql/ha_federated.cc: update to new prototype 2005-03-17 16:58:23 +01: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-17 18:44:24 +03:00
ha_heap.h
ha_innodb.cc Merge bk-internal:/home/bk/mysql-5.0 2005-03-22 16:11:43 +01:00
ha_innodb.h Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
ha_myisam.cc Merge with after merge fix 2005-03-04 11:37:45 +01:00
ha_myisam.h
ha_myisammrg.cc
ha_myisammrg.h
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 merged 2005-03-23 09:42:24 +01:00
handler.h Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge bk-internal:/home/bk/mysql-5.0 2005-03-22 16:11:43 +01:00
item.h after merge fix 2005-03-17 18:44:24 +03:00
item_buff.cc
item_cmpfunc.cc Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08: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
item_func.cc Fix Windows compile warnings, declarations of walk functions 2005-03-22 00:00:24 +01:00
item_func.h WL#874 "Extended LOAD DATA". 2005-03-16 04:32:47 +03:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
item_strfunc.h Merge 2005-03-05 18:20:35 +04:00
item_subselect.cc Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
item_subselect.h
item_sum.cc merged 2005-03-23 09:42:24 +01:00
item_sum.h merged 2005-03-23 09:42:24 +01:00
item_timefunc.cc
item_timefunc.h
item_uniq.cc
item_uniq.h
key.cc Merge 4.1 -> 5.0 2005-03-17 16:51:07 +03: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 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-03-22 00:28:33 +01:00
log_event.cc Merge bk-internal:/home/bk/mysql-5.0 2005-03-22 16:11:43 +01:00
log_event.h Last part of WL#1062: better replication of timezones: no more use 2005-03-22 00:26:12 +01:00
Makefile.am Removed support for RAID, mit-threads, and MySQL FS (really, if someone wants this feature look at a web-dav hookup). 2005-03-16 16:22:56 -08:00
matherr.c
mf_iocache.cc
my_decimal.cc Rename decimal -> decimal_t, decimal_digit -> decimal_digit_t 2005-03-21 15:58:34 +03:00
my_decimal.h Rename decimal -> decimal_t, decimal_digit -> decimal_digit_t 2005-03-21 15:58:34 +03:00
my_lock.c
mysql_priv.h Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-03-22 00:28:33 +01:00
mysqld.cc Cleanups during review of code 2005-03-21 23:41:28 +02:00
mysqld_suffix.h
net_serv.cc Merge changes. 2005-03-08 17:24:07 +01:00
nt_servc.cc
nt_servc.h
opt_range.cc Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
opt_range.h
opt_sum.cc Merge 2005-03-05 18:20:35 +04:00
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 after merge fixes 2005-03-09 19:22:30 +01:00
protocol.h
protocol_cursor.cc
records.cc
repl_failsafe.cc
repl_failsafe.h
set_var.cc Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-03-22 00:28:33 +01:00
set_var.h Last part of WL#1062: better replication of timezones: no more use 2005-03-22 00:26:12 +01:00
slave.cc disabling rpl_timezone.test if --ps-protocol, as binlogging of CONVERT_TZ(,,@@time_zone) 2005-03-22 11:38:51 +01:00
slave.h Last part of WL#1062: better replication of timezones: no more use 2005-03-22 00:26:12 +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 Fixed BUG#6600: Stored procedure crash after repeated calls with check table 2005-03-18 16:52:41 +01: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
spatial.h
sql_acl.cc merged 2005-03-23 09:42:24 +01:00
sql_acl.h sql_acl.cc, sql_acl.h, sql_parse.cc 2005-03-22 15:54:18 +01:00
sql_analyse.cc Remove compiler warnings and remove not used variables 2005-02-25 16:53:22 +02:00
sql_analyse.h
sql_base.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_bitmap.h
sql_cache.cc Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
sql_cache.h
sql_class.cc Fix complilation failure 2005-03-09 20:49:44 +01:00
sql_class.h Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_db.cc Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08: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
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 Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
sql_insert.cc Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
sql_lex.cc Manual merge SP-locking improvements patch with current tree. 2005-03-04 17:46:45 +03:00
sql_lex.h Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
sql_list.cc
sql_list.h
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
sql_parse.cc merged 2005-03-23 09:42:24 +01:00
sql_prepare.cc Field::quote_data(): 2005-03-17 12:27:45 +01: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 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-03-21 23:46:11 +02:00
sql_select.h Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
sql_show.cc sql_acl.cc, sql_acl.h, sql_parse.cc 2005-03-22 15:54:18 +01:00
sql_sort.h
sql_state.c
sql_string.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_string.h Cleanups during review of code 2005-03-21 23:41:28 +02:00
sql_table.cc Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if 2005-03-22 21:52:01 +01:00
sql_test.cc
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
sql_union.cc manual merge 2005-03-03 14:29:37 +04:00
sql_update.cc Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08: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
sql_yacc.yy sql_acl.cc, sql_acl.h, sql_parse.cc 2005-03-22 15:54:18 +01:00
stacktrace.c
stacktrace.h
strfunc.cc Remove compiler warnings and remove not used variables 2005-02-25 16:53:22 +02:00
structs.h
table.cc Hack to ensure that CHAR's created in 5.0 are not converted to VARCHAR even if 2005-03-22 21:52:01 +01:00
table.h Eliminate warnings noticed by VC7. This includes fixing my_mmap() on 2005-03-18 16:12:25 -08:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Last part of WL#1062: better replication of timezones: no more use 2005-03-22 00:26:12 +01:00
tztime.h Last part of WL#1062: better replication of timezones: no more use 2005-03-22 00:26:12 +01:00
udf_example.cc
uniques.cc
unireg.cc Bug#3788 2005-03-04 21:14:35 +00:00
unireg.h
watchdog_mysqld