mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown fbf2bc183a Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 
into  maint2.mysql.com:/data/localhome/tsmith/bk/51


client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
include/config-netware.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/partition.result:
  Auto merged
mysql-test/r/partition_mgm.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/innodb_mysql.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/fsp/fsp0fsp.c:
  Auto merged
storage/innobase/include/btr0cur.ic:
  Auto merged
storage/innobase/include/buf0buf.ic:
  Auto merged
storage/innobase/log/log0log.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/innobase/ut/ut0dbg.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BUILD/check-cpu:
  Manual merge
storage/innobase/row/row0mysql.c:
  Manual merge
2006-09-04 23:05:17 +02:00
..
share Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 2006-08-31 04:56:09 -04:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt fix for windows build 2006-08-24 22:10:55 -07:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_scheduler.cc
event_scheduler.h
event_timed.cc
event_timed.h
events.cc
events.h
events_priv.h
field.cc Post-merge fixes. 2006-08-30 23:09:47 +04:00
field.h Cheery picked Antony's patch to allow for Window's builds in 5.1 2006-08-15 21:49:26 -07:00
field_conv.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-15 01:04:51 +04:00
filesort.cc This is a cleanup of warnings that windows is complaining about. 2006-08-23 15:12:42 -07:00
frm_crypt.cc
gen_lex_hash.cc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0-maint-gca 2006-08-23 18:37:04 -04:00
gstream.cc
gstream.h
ha_innodb.cc Fix for BUG#20866 "show table status on innodb raises assertion" 2006-08-29 17:37:48 +02:00
ha_innodb.h Cleanup of unused variables. 2006-08-25 13:31:15 -07:00
ha_ndbcluster.cc Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 2006-08-29 22:56:23 +02:00
ha_ndbcluster.h Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-22 20:55:28 +02:00
ha_ndbcluster_binlog.cc Merge perch.ndb.mysql.com:/home/jonas/src/51-work 2006-08-15 09:39:26 +02:00
ha_ndbcluster_binlog.h Bug#18775 - Temporary table from alter table visible to other threads 2006-08-02 17:57:06 +02:00
ha_ndbcluster_tables.h
ha_partition.cc Merge dator5.(none):/home/pappa/clean-mysql-5.1 2006-08-31 04:21:14 -04:00
ha_partition.h Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 2006-08-26 06:14:05 -04:00
handler.cc Merge bk-internal:/home/bk/mysql-5.1-new-maint 2006-08-31 10:33:35 +02:00
handler.h Merge dator5.(none):/home/pappa/clean-mysql-5.1 2006-08-31 04:21:14 -04:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 2006-09-01 14:08:38 +04:00
item.h Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 2006-09-01 14:08:38 +04:00
item_buff.cc
item_cmpfunc.cc Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 2006-09-01 14:08:38 +04:00
item_cmpfunc.h Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_create.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-08-17 22:30:32 +02:00
item_create.h Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
item_func.cc Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 2006-09-01 14:08:38 +04:00
item_func.h Merge moonbone.local:/work/tmp_merge-5.0-mysql 2006-08-29 18:58:50 +04:00
item_geofunc.cc Fix for the failing gis.test 2006-08-18 22:29:35 +05:00
item_geofunc.h
item_row.cc Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 2006-08-30 03:00:19 +04:00
item_row.h
item_strfunc.cc Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 2006-09-04 23:05:17 +02:00
item_strfunc.h Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 2006-09-04 23:05:17 +02:00
item_subselect.cc Merge moonbone.local:/work/tmp_merge-5.0-mysql 2006-08-29 18:58:50 +04:00
item_subselect.h Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_sum.cc Manual merge 5.0->5.1. Post-merge fixes. 2006-08-14 13:27:11 +04:00
item_sum.h Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
item_timefunc.cc Merge moonbone.local:/work/tmp_merge-5.0-mysql 2006-08-29 18:58:50 +04:00
item_timefunc.h
item_uniq.cc
item_uniq.h
item_xmlfunc.cc Bug#20795: extractvalue() won't accept names containing a dot (.) 2006-07-25 18:46:43 +05:00
item_xmlfunc.h
key.cc
lex.h This is the second patch for bdb removeal. This takes care of all options and variables that rely on bdb. 2006-08-10 01:50:37 -07:00
lex_symbol.h
lock.cc Fix for bug#19403/12212 "Crash that happens during removing of database name 2006-08-21 19:02:11 +04:00
log.cc Fix Bug #18559 "log tables cannot change engine, and 2006-08-03 21:28:15 +04:00
log.h Fix Bug #18559 "log tables cannot change engine, and 2006-08-03 21:28:15 +04:00
log_event.cc
log_event.h
Makefile.am Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 2006-08-30 03:00:19 +04:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h Bug#16172 DECIMAL data type processed incorrectly 2006-08-08 16:03:42 +05:00
my_lock.c
mysql_priv.h Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 2006-09-01 14:08:38 +04:00
mysqld.cc Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 2006-09-04 23:05:17 +02:00
mysqld_suffix.h
net_serv.cc Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 2006-08-30 03:00:19 +04:00
nt_servc.cc
nt_servc.h
opt_range.cc sql_base.cc, ndb_condition_pushdown.result, opt_range.cc: 2006-08-30 22:11:23 +04:00
opt_range.h BUG#21077: Possible crash caused by invalid sequence of handler::* calls: 2006-08-15 20:33:14 +04:00
opt_sum.cc
parse_file.cc
parse_file.h
partition_element.h This is a cleanup of warnings that windows is complaining about. 2006-08-23 15:12:42 -07:00
partition_info.cc
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 2006-08-30 03:00:19 +04:00
protocol.h
records.cc
repl_failsafe.cc
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc
rpl_injector.h
rpl_rli.h
rpl_tblmap.cc
rpl_tblmap.h
set_var.cc Merge moonbone.local:/work/tmp_merge-5.0-mysql 2006-08-29 18:58:50 +04:00
set_var.h Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
slave.cc Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50 2006-08-23 16:03:57 -06:00
slave.h
sp.cc Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 2006-08-30 03:00:19 +04:00
sp.h Bug#21039 Transaction cache not flushed after SELECT CREATE 2006-07-26 12:40:26 +02:00
sp_cache.cc
sp_cache.h
sp_head.cc Post-merge fixes. 2006-08-30 23:09:47 +04:00
sp_head.h Post-merge fixes. 2006-08-30 23:09:47 +04:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc Bug#8153 (Stored procedure with subquery and continue handler, wrong result) 2006-08-02 22:18:49 -07:00
sp_rcontext.h Bug#8153 (Stored procedure with subquery and continue handler, wrong result) 2006-08-02 22:18:49 -07:00
spatial.cc
spatial.h
sql_acl.cc Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 2006-09-04 23:05:17 +02:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc sql_base.cc, ndb_condition_pushdown.result, opt_range.cc: 2006-08-30 22:11:23 +04:00
sql_binlog.cc
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 2006-08-30 03:00:19 +04:00
sql_cache.h BUG#21051: RESET QUERY CACHE very slow when query_cache_type=0 2006-08-22 11:47:52 +04:00
sql_class.cc Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 2006-09-01 14:08:38 +04:00
sql_class.h Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-14 16:30:57 +04:00
sql_delete.cc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-31 12:14:27 +04:00
sql_derived.cc
sql_do.cc
sql_error.cc Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 2006-08-30 03:00:19 +04:00
sql_error.h Cleanup patch. 2006-08-17 18:13:45 +02:00
sql_handler.cc
sql_help.cc
sql_insert.cc Merge moonbone.local:/work/tmp_merge-5.0-mysql 2006-08-29 18:58:50 +04:00
sql_lex.cc Bug #20908: Crash if select @@"" 2006-08-23 19:14:58 +02:00
sql_lex.h Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2006-08-17 19:09:55 +02:00
sql_list.cc
sql_list.h
sql_load.cc Merge moonbone.local:/work/tmp_merge-5.0-mysql 2006-08-29 18:58:50 +04:00
sql_locale.cc Fix compile errors in VC++ 7.0 2006-08-21 16:21:48 +04:00
sql_manager.cc Removed bdb test cases. 2006-08-10 18:29:25 -07:00
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-opt 2006-09-01 14:08:38 +04:00
sql_partition.cc BUG#21658: Crash partition test in prepared statement protocol 2006-08-31 04:16:22 -04:00
sql_partition.h
sql_plugin.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-25 14:07:30 -07:00
sql_plugin.h
sql_prepare.cc Merge neptunus.(none):/home/msvensson/mysql/bug21813/my50-bug21813 2006-08-30 17:25:56 +02:00
sql_rename.cc Bug#18775 - Temporary table from alter table visible to other threads 2006-08-02 17:57:06 +02:00
sql_repl.cc
sql_repl.h
sql_select.cc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-31 12:14:27 +04:00
sql_select.h BUG#14940 "MySQL choose wrong index", v.2 2006-07-28 21:27:01 +04:00
sql_show.cc Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51 2006-09-04 23:05:17 +02:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h
sql_table.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-14 16:30:57 +04:00
sql_tablespace.cc
sql_test.cc
sql_trigger.cc Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 2006-08-30 03:00:19 +04:00
sql_trigger.h Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 2006-08-30 03:00:19 +04:00
sql_udf.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
sql_udf.h
sql_union.cc
sql_update.cc Merge moonbone.local:/work/tmp_merge-5.0-mysql 2006-08-29 18:58:50 +04:00
sql_view.cc Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 2006-08-30 03:00:19 +04:00
sql_view.h Merge sunlight.local:/local_work/leak_fix_orig 2006-08-09 02:49:29 +04:00
sql_yacc.yy Merge dator5.(none):/home/pappa/clean-mysql-5.1 2006-08-31 04:49:34 -04:00
stacktrace.c Post-review fix (bug #21250) 2006-08-26 10:21:26 +04:00
stacktrace.h Added stacktrace dumps for x86_64 (bug #21250) 2006-08-25 17:59:47 +04:00
strfunc.cc
structs.h
table.cc BUG#21658: Crash partition test in prepared statement protocol 2006-08-31 04:16:22 -04:00
table.h Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-23 16:48:39 +04:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc Cleanup patch. 2006-08-17 18:13:45 +02:00
tztime.h
udf_example.c Fix a compilation failiure on QNX 2006-08-02 13:25:13 +04:00
uniques.cc
unireg.cc Merge bk-internal:/home/bk/mysql-5.1 2006-07-19 08:57:52 +02:00
unireg.h Merge sunlight.local:/local_work/leak_fix_orig 2006-08-09 02:49:29 +04:00