mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown bdf18f4331 Merge mysql.com:/home/jimw/my/mysql-5.0-7955 
into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/bdb.result:
  Resolve conflict
mysql-test/t/bdb.test:
  Resolve conflict
sql/share/errmsg.txt:
  Resolve conflict
2006-02-17 11:03:34 -08:00
..
share Merge mysql.com:/home/jimw/my/mysql-5.0-7955 2006-02-17 11:03:34 -08:00
.cvsignore
add_errmsg
authors.h
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc WL#1324 table name to file name encoding 2005-12-31 09:01:26 +04:00
event.cc fix bug in show events which shows 2006-02-16 13:11:16 +01:00
event.h small post-merge fixes for bug#16406 2006-02-16 05:21:02 +01:00
event_executor.cc merge 2006-02-16 01:27:36 +01:00
event_priv.h merge 2006-02-16 01:27:36 +01:00
event_timed.cc fix bug in show events which shows 2006-02-16 13:11:16 +01:00
field.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 00:02:56 +03:00
field.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
field_conv.cc
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_archive.cc This patch adds a new field to the meta file for tracking flushes (this is being kept to later do stats and determine how often the compression buffer is being foiled). This should keep things all nice an compatible between versions. 2006-02-15 00:59:24 -08:00
ha_archive.h This patch adds a new field to the meta file for tracking flushes (this is being kept to later do stats and determine how often the compression buffer is being foiled). This should keep things all nice an compatible between versions. 2006-02-15 00:59:24 -08:00
ha_berkeley.cc WL#1359 NDB: Add table handler and table information available from SQL commands 2006-01-28 16:16:23 +13:00
ha_berkeley.h
ha_blackhole.cc WL#1359 NDB: Add table handler and table information available from SQL commands 2006-01-28 16:16:23 +13:00
ha_blackhole.h
ha_federated.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 00:33:31 +03:00
ha_federated.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 00:33:31 +03:00
ha_heap.cc Merge mysql.com:/home/kostja/mysql/tmp_merge1 2006-02-09 00:21:22 +03:00
ha_heap.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 23:53:45 +03:00
ha_innodb.cc This patch removes the remaining TYPE= code from MySQL. It cleans up a number of tests where it was being called still (and failing). Also I cleaned up all of the extra scripts so that they now work. 2006-02-12 13:26:30 -08:00
ha_innodb.h Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582. 2006-01-31 21:41:48 +03:00
ha_myisam.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-11 17:26:32 -08:00
ha_myisam.h Fix the tree: plugin-related changes, necessary for 2006-01-20 00:40:56 +03:00
ha_myisammrg.cc dbug changes: 2006-02-14 22:36:11 +01:00
ha_myisammrg.h
ha_ndbcluster.cc Bug #17210 Create temp table call to ha_ndbcluster::create_handler_files caused core 2006-02-17 17:12:35 +01:00
ha_ndbcluster.h Bug #17340 SHOW CREATE TABLE from second session crashes the server 2006-02-13 21:55:49 +01:00
ha_ndbcluster_binlog.cc ndb - wl#3023 : pass tables per GCI to injector at epoch start 2006-02-16 14:54:30 +01:00
ha_ndbcluster_binlog.h Bug #17038, distribution of schema operation to multiple binlogs missing/multiple entries, partial fix 2006-02-06 11:47:12 +01:00
ha_ndbcluster_tables.h wl2325 wl2324 2006-01-12 19:51:02 +01:00
ha_partition.cc WL#2645 (CHECK FOR UPGRADE) 2006-02-17 13:37:37 +04:00
ha_partition.h WL# 2986 2006-01-28 16:22:32 -08:00
handler.cc WL#2645 (CHECK FOR UPGRADE) 2006-02-17 13:37:37 +04:00
handler.h Bug #17210 Create temp table call to ha_ndbcluster::create_handler_files caused core 2006-02-17 17:12:35 +01:00
handlerton-win.cc
handlerton.cc.in
hash_filo.cc
hash_filo.h
hostname.cc
init.cc WL#1324 table name to file name encoding 2005-12-31 09:01:26 +04:00
item.cc Merge mysql.com:/home/jimw/my/mysql-5.0-clean 2006-02-17 10:59:47 -08:00
item.h Merge mysql.com:/home/jimw/my/mysql-5.0-clean 2006-02-17 10:59:47 -08:00
item_buff.cc
item_cmpfunc.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-15 14:04:56 +01:00
item_cmpfunc.h Merge mysql.com:/opt/local/work/mysql-4.1-12734 2006-01-14 19:12:07 +03:00
item_create.cc
item_create.h
item_func.cc Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 2006-02-09 13:35:59 +03:00
item_func.h Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1 2006-02-07 15:30:32 +04:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Merge mysql.com:/home/jimw/my/mysql-5.0-14676 2006-02-17 08:32:50 -08:00
item_strfunc.h
item_subselect.cc
item_subselect.h Fix bug #15706 find_field_in_tables() returns field from outer select 2006-02-15 19:45:06 +03:00
item_sum.cc
item_sum.h
item_timefunc.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 14:05:19 +03:00
item_timefunc.h - fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON) 2006-01-18 20:41:22 +01:00
item_uniq.cc
item_uniq.h
item_xmlfunc.cc Bug#16234 XML: Crash if ExtractValue() 2006-02-10 13:24:10 +04:00
item_xmlfunc.h
key.cc
lex.h Merging 5.0->5.1 2006-02-17 11:26:03 +04:00
lex_symbol.h
lock.cc dbug changes: 2006-02-14 22:36:11 +01:00
log.cc Merge 2006-02-12 20:45:03 +01:00
log.h Merge 2006-02-12 20:45:03 +01:00
log_event.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-15 14:04:56 +01:00
log_event.h Back out errorneous Windows fix. 2006-01-20 13:17:55 +01:00
Makefile.am make clean generated as appropriate 2006-01-20 12:54:34 +01:00
matherr.c
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-13 11:53:56 +04:00
mysqld.cc Automerge 2006-02-15 00:01:46 +01:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc Automerge 2006-02-15 00:01:46 +01:00
opt_range.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
opt_sum.cc Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0 2006-01-06 23:26:20 -08:00
parse_file.cc Fix for crash of "mysql-test-run --debug mysqldump": don't access dir->str if dir is null. 2006-01-24 15:37:56 +01:00
parse_file.h
password.c Merge mysql.com:/opt/local/work/mysql-4.1-root 2006-01-11 17:49:56 +03:00
procedure.cc
procedure.h
protocol.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 23:27:06 +03:00
protocol.h Big patch to make embedded-server working in 5.x 2006-01-04 14:20:28 +04:00
records.cc
repl_failsafe.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc wl2325 wl2324 2006-01-12 19:51:02 +01:00
rpl_injector.h wl2325 wl2324 2006-01-12 19:51:02 +01:00
rpl_rli.h
rpl_tblmap.cc
rpl_tblmap.h Compile fixes for aix52-64bit. 2006-01-01 22:18:02 +01:00
set_var.cc Merge mysql.com:/home/jimw/my/mysql-5.0-7955 2006-02-17 11:03:34 -08:00
set_var.h Merge mysql.com:/home/jimw/my/mysql-5.0-7955 2006-02-17 11:03:34 -08:00
slave.cc Merging 5.0->5.1 2006-02-17 11:26:03 +04:00
slave.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sp.cc Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 2006-02-09 13:35:59 +03:00
sp.h Fixed BUG#16303: erroneus stored procedures and functions should be droppable 2006-01-26 13:29:46 +01:00
sp_cache.cc
sp_cache.h
sp_head.cc fix for bug#16410 (Events: CREATE EVENT is legal in a CREATE TRIGGER statement) 2006-02-15 17:12:27 +01:00
sp_head.h Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 2006-02-09 13:35:59 +03:00
sp_pcontext.cc
sp_pcontext.h Merge mysql.com:/extern/mysql/bk/mysql-5.0 2006-01-16 15:37:25 +01:00
sp_rcontext.cc Post-review fix for BUG#15011. 2006-02-01 16:00:11 +01:00
sp_rcontext.h
spatial.cc
spatial.h Merging 2006-01-21 18:50:06 +04:00
sql_acl.cc make declarations of mysql_db_table_last_check and mysql_db_table_fields 2006-02-14 22:21:23 +01:00
sql_acl.h manual merge 2006-02-14 17:05:36 +01:00
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Bug #17179 schema creation fails 2006-02-13 20:34:36 +01:00
sql_binlog.cc
sql_bitmap.h
sql_cache.cc dbug changes: 2006-02-14 22:36:11 +01:00
sql_cache.h
sql_class.cc Many files: 2006-02-14 08:24:01 +04:00
sql_class.h Many files: 2006-02-14 08:24:01 +04:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc Big patch to make embedded-server working in 5.x 2006-01-04 14:20:28 +04:00
sql_cursor.h
sql_db.cc merge 2006-02-16 01:27:36 +01:00
sql_delete.cc WL#2985 "Partition pruning", "do pruning for UPDATE/DELETE": Post-merge fixes 2006-02-06 18:33:39 +03:00
sql_derived.cc
sql_do.cc
sql_error.cc fix for bug #17289 Events: missing privilege check for drop database 2006-02-10 15:02:57 +01:00
sql_error.h
sql_handler.cc Merge mysql.com:/home/kostja/mysql/mysql-5.0-for_merge 2006-02-02 12:03:35 +03:00
sql_help.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sql_insert.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sql_lex.cc Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 2006-02-09 13:35:59 +03:00
sql_lex.h Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-13 11:53:56 +04:00
sql_list.cc
sql_list.h
sql_load.cc Bug#17081 LOAD DATA INFILE" may not load all the data 2006-02-07 11:47:04 +01:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc fix for bug#16410 (Events: CREATE EVENT is legal in a CREATE TRIGGER statement) 2006-02-15 17:12:27 +01:00
sql_partition.cc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-15 12:52:30 +01:00
sql_plugin.cc Automerge 2006-02-15 00:01:46 +01:00
sql_plugin.h Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-14 22:57:12 +01:00
sql_prepare.cc Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2006-02-10 18:04:46 +01:00
sql_rename.cc renamedb.test, renamedb.result: 2006-02-13 11:49:28 +04:00
sql_repl.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sql_repl.h
sql_select.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-15 14:04:56 +01:00
sql_select.h Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 23:53:45 +03:00
sql_show.cc Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-16 14:53:36 +01:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Merge mysql.com:/home/jimw/my/mysql-5.1-17169 2006-02-17 10:55:43 -08:00
sql_tablespace.cc bug: replication of table spaces to work 2006-01-11 19:49:38 +01:00
sql_test.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-02 16:57:34 +03:00
sql_trigger.cc Polishing: after implementing TRIGGER privilege, mysqld option 2006-02-13 15:00:01 +03:00
sql_trigger.h Fix for the following bugs: 2006-01-24 20:15:12 +03:00
sql_udf.cc
sql_udf.h
sql_union.cc
sql_update.cc Merge mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 23:53:45 +03:00
sql_view.cc Bug #17206 Update through VIEW is not working 2006-02-08 18:08:18 +01:00
sql_view.h
sql_yacc.yy Merge mysql.com:/home/jimw/my/mysql-5.0-7955 2006-02-17 11:03:34 -08:00
stacktrace.c
stacktrace.h
strfunc.cc Making old tables seen with "#mysql50#" prefix, 2005-12-31 12:34:39 +04:00
structs.h WL#2935 - SHOW STATUS support in plugins 2006-01-07 14:41:57 +01:00
table.cc post-merge fixes of bug 16548 2006-02-14 20:10:51 +01:00
table.h Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 2006-02-16 16:53:34 +03:00
thr_malloc.cc
time.cc - fix bug #16435 (Weekly events execute every second) (WL#1034 Internal CRON) 2006-01-18 20:41:22 +01:00
tzfile.h
tztime.cc WL #1034 (Internal CRON) 2006-01-10 21:02:19 +01:00
tztime.h
udf_example.cc
uniques.cc many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
unireg.cc two buffer overflows fixed 2006-01-28 19:21:40 +01:00
unireg.h
watchdog_mysqld