mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 167aaaa5a4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1


mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
server-tools/instance-manager/portability.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysql.cc:
  Manual merge.
mysql-test/mysql-test-run.pl:
  Manual merge.
2006-08-21 12:59:46 -04:00
..
share Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 2006-08-15 17:02:08 +02:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB. 2006-08-14 14:45:48 -07:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_scheduler.cc
event_scheduler.h
event_timed.cc After merge fixes. 2006-07-07 03:07:45 +04:00
event_timed.h
events.cc Another post-merge fix. 2006-07-07 13:49:43 +04:00
events.h
events_priv.h
field.cc Cheery picked Antony's patch to allow for Window's builds in 5.1 2006-08-15 21:49:26 -07: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
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_federated.cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-16 10:03:24 -07:00
ha_federated.h Post 5.0engines to 5.1 engines merge fix that didn't make it into that push. 2006-08-14 08:43:37 -07:00
ha_heap.cc
ha_heap.h
ha_innodb.cc Applied innodb-5.0-ss677 snapshot. 2006-08-01 21:59:58 +02:00
ha_innodb.h Make innodb_flush_log_at_trx_commit a settable global variable. 2006-07-29 07:17:33 +04:00
ha_myisam.cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-10 14:28:39 -07:00
ha_myisam.h
ha_myisammrg.cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-10 14:28:39 -07:00
ha_myisammrg.h
ha_ndbcluster.cc Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2006-08-15 14:39:48 +02:00
ha_ndbcluster.h Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2006-08-15 14:39:48 +02:00
ha_ndbcluster_binlog.cc Bug#18775 - Temporary table from alter table visible to other threads 2006-08-02 17:57:06 +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-07-15 04:06:31 -04:00
ha_partition.h Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 2006-07-15 03:59:53 -04:00
handler.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 2006-08-10 13:44:04 -07:00
handler.h Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2006-08-04 14:48:51 +04:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
item.h Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
item_buff.cc
item_cmpfunc.cc Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +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/tmp_reg 2006-08-17 17:19:41 +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 bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
item_func.h Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
item_geofunc.cc A couple of adjustments to the merge to fix the broken build 2006-08-17 22:24:35 +02:00
item_geofunc.h Merge mysql.com:/home/mydev/mysql-4.1-bug14400 2006-07-05 11:20:10 +02:00
item_row.cc
item_row.h
item_strfunc.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
item_strfunc.h Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
item_subselect.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +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 zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 2006-08-21 12:55:43 -04:00
item_timefunc.h
item_uniq.cc
item_uniq.h
item_xmlfunc.cc Post-merge fixes. 2006-07-14 02:07:37 +04: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 Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge 2006-07-04 10:02:11 +02: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 Post-merge fixes. 2006-07-13 17:34:49 +04:00
log_event.h Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 2006-07-03 11:35:58 -04:00
Makefile.am Removed bdb test cases. 2006-08-10 18:29:25 -07:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Many files: 2006-08-21 15:34:29 +02:00
mysqld.cc Merge bk-internal.mysql.com:/data0/bk/tmp_reg 2006-08-17 17:19:41 +02:00
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 2006-08-01 09:24:19 +04:00
opt_range.h Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql 2006-07-30 00:33:24 +04:00
opt_sum.cc Merge mysql.com:/home/mydev/mysql-4.1-bug11824 2006-07-05 11:11:40 +02:00
parse_file.cc
parse_file.h
partition_element.h
partition_info.cc
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
protocol.h
records.cc
repl_failsafe.cc
repl_failsafe.h
rpl_filter.cc Fixes for Windows compilation failures. 2006-07-07 16:14:07 +04:00
rpl_filter.h Fixes for Windows compilation failures. 2006-07-07 16:14:07 +04:00
rpl_injector.cc
rpl_injector.h
rpl_rli.h
rpl_tblmap.cc
rpl_tblmap.h
set_var.cc Fix for bug #21642: "configure" with no arguments does not build 2006-08-20 17:24:48 -04:00
set_var.h Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
slave.cc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 2006-08-21 12:55:43 -04:00
slave.h
sp.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +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 Manual merge 5.0->5.1. Post-merge fixes. 2006-08-14 13:27:11 +04:00
sp_head.h Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 2006-08-21 12:59:46 -04:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-10 14:28:39 -07:00
sql_binlog.cc
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
sql_cache.h
sql_class.cc Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 2006-08-09 13:37:20 +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 bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-14 16:30:57 +04:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge 2006-07-04 10:02:11 +02:00
sql_help.cc
sql_insert.cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-10 14:28:39 -07:00
sql_lex.cc Merge bk-internal.mysql.com:/data0/bk/tmp_reg 2006-08-17 17:19:41 +02:00
sql_lex.h Manual merge 5.0->5.1. Post-merge fixes. 2006-08-14 13:27:11 +04:00
sql_list.cc
sql_list.h
sql_load.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-07-13 00:18:59 +04:00
sql_locale.cc Backporting Kostja's changes made for 5.0 into 4.1. 2006-07-18 15:53:12 +05: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 bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
sql_partition.cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-10 14:28:39 -07:00
sql_partition.h
sql_plugin.cc
sql_plugin.h
sql_prepare.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04: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 moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 2006-08-09 13:37:20 +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 bk-internal.mysql.com:/data0/bk/tmp_reg 2006-08-17 17:19:41 +02:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc
sql_string.h Bug#19006: 4.0 valgrind problems (in test func_str) 2006-07-01 14:31:52 -04:00
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 bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-14 16:30:57 +04:00
sql_trigger.h After merge fixes for patch solving bug#18437 "Wrong values inserted with a 2006-07-06 13:33:23 +04:00
sql_udf.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-08-12 21:06:51 +04:00
sql_udf.h Fix compiler warnings in sql_udf.h: ISO C++ forbids casting 2006-07-09 13:03:51 +04:00
sql_union.cc
sql_update.cc Merge bodhi.local:/opt/local/work/tmp_merge 2006-07-26 23:33:25 +04:00
sql_view.cc Merge bk-internal.mysql.com:/data0/bk/tmp_reg 2006-08-17 17:19:41 +02:00
sql_view.h Merge sunlight.local:/local_work/leak_fix_orig 2006-08-09 02:49:29 +04:00
sql_yacc.yy Merge bk-internal.mysql.com:/data0/bk/tmp_reg 2006-08-17 17:19:41 +02:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h WL#3146 "less locking in auto_increment": 2006-07-09 17:52:19 +02:00
table.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2006-08-14 16:30:57 +04:00
table.h Merge bk-internal.mysql.com:/data0/bk/tmp_reg 2006-08-17 17:19:41 +02:00
thr_malloc.cc
time.cc Bug#20729: Bad date_format() call makes mysql server crash 2006-07-11 13:06:29 -04:00
tzfile.h
tztime.cc Merge bodhi.netgear:/opt/local/work/tmp_merge 2006-07-06 22:55:48 +04: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