mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 39511a56c9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/home/brian/mysql/merge-5.1


sql/mysql_priv.h:
  Auto merged
2006-09-22 23:33:08 -07:00
..
examples Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2006-09-05 17:44:08 -04:00
share Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 2006-09-18 12:16:03 -07:00
.cvsignore
add_errmsg
authors.h errmsg.txt: 2006-09-07 13:52:30 +10:00
client_settings.h
CMakeLists.txt Windows 64bit fixes 2006-09-21 15:19:20 +02:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc WL#3337 (Event scheduler new architecture) 2006-08-28 10:27:42 +02:00
event_data_objects.h WL#3337 (Event scheduler new architecture) 2006-08-17 14:22:59 +02:00
event_db_repository.cc remove unused artifacts 2006-09-01 14:25:29 +02:00
event_db_repository.h WL#3337 (Event scheduler new architecture) 2006-08-28 10:27:42 +02:00
event_queue.cc Fix an assert on AIX 5.2, 64bit. COND_queue_state wasn't 2006-09-14 23:25:59 +02:00
event_queue.h WL#3337 (Event scheduler new architecture) 2006-09-12 12:26:12 +02:00
event_scheduler.cc WL#3337 (Event scheduler new architecture) 2006-09-12 12:26:12 +02:00
event_scheduler.h WL#3337 (Event scheduler new architecture) 2006-09-12 12:26:12 +02:00
events.cc WL#3337 (Event scheduler new architecture) 2006-09-12 12:26:12 +02:00
events.h ws fix 2006-09-12 17:48:26 +02:00
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_ndbcluster.cc Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb 2006-09-22 21:14:58 +02:00
ha_ndbcluster.h Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2006-09-18 09:26:18 +02:00
ha_ndbcluster_binlog.cc Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb 2006-09-22 21:14:58 +02:00
ha_ndbcluster_binlog.h Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb 2006-09-22 21:14:58 +02:00
ha_ndbcluster_tables.h
ha_partition.cc This changes the order of the universe, black is now the new white. 2006-09-15 10:28:00 -07:00
ha_partition.h Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 2006-08-26 06:14:05 -04:00
handler.cc post merge fixes 2006-09-18 15:52:16 -07:00
handler.h Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 2006-09-18 12:16:03 -07:00
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02:00
item.h Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02:00
item_buff.cc
item_cmpfunc.cc Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02:00
item_cmpfunc.h Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02: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 dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02:00
item_func.h Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02: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 maint1.mysql.com:/data/localhome/cmiller/bug15583/my51-bug15583 2006-09-13 15:13:52 +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 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-09-15 10:48:30 -07: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 WL#3337 (Event scheduler new architecture) 2006-09-12 12:26:12 +02: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 This changes the order of the universe, black is now the new white. 2006-09-15 10:28:00 -07:00
log.h Post-merge fixes: 2006-09-13 15:37:35 -06:00
log_event.cc Fixed the faulty merge 2006-09-13 21:25:33 +04:00
log_event.h
Makefile.am added udf_example.def for make dist 2006-09-21 15:56:14 +02:00
matherr.c
message.mc make dist changes for Cmake build 2006-09-01 10:32:12 +02:00
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 baker@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-09-22 23:33:08 -07:00
mysqld.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 2006-09-16 07:19:42 +02:00
mysqld_suffix.h
net_serv.cc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 2006-09-05 16:46:55 -04:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge chilla.local:/home/mydev/mysql-5.1--team 2006-09-20 14:36:32 +02:00
opt_range.h merge fixes 2006-09-18 12:14:27 +02:00
opt_sum.cc Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02:00
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 This changes the order of the universe, black is now the new white. 2006-09-15 10:28:00 -07:00
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 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 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-09-15 10:48:30 -07:00
set_var.h WL#3337 (Event scheduler new architecture) 2006-09-01 13:08:44 +02:00
slave.cc Merge siva.hindu.god:/usr/home/tim/m/bk/b20536-50 2006-08-23 16:03:57 -06:00
slave.h Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02:00
sp.cc Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02: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 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-09-15 14:15:09 +05: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/mrg50/50 2006-09-13 09:03:52 +02:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm 2006-09-13 15:22:50 +03:00
sql_binlog.cc
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc This changes the order of the universe, black is now the new white. 2006-09-15 10:28:00 -07: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 bk-internal.mysql.com:/data0/bk/mysql-5.1-runtime 2006-09-06 14:35:27 +02:00
sql_class.h Fixed the faulty merge 2006-09-13 21:25:33 +04:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc WL#3337 (Event scheduler new architecture) 2006-08-17 14:22:59 +02:00
sql_delete.cc Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02: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 dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02:00
sql_lex.cc Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02:00
sql_lex.h Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02:00
sql_list.cc
sql_list.h Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02:00
sql_load.cc Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02: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 dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02:00
sql_partition.cc This changes the order of the universe, black is now the new white. 2006-09-15 10:28:00 -07:00
sql_partition.h
sql_plugin.cc This changes the order of the universe, black is now the new white. 2006-09-15 10:28:00 -07:00
sql_plugin.h converting plugin states to bitmask to simplify testing. 2006-09-06 10:22:59 +02:00
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 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 2006-09-04 14:08:15 +02:00
sql_repl.h Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50 2006-09-13 09:03:52 +02:00
sql_select.cc Merge chilla.local:/home/mydev/mysql-5.1--team 2006-09-20 14:36:32 +02:00
sql_select.h BUG#14940 "MySQL choose wrong index", v.2 2006-07-28 21:27:01 +04:00
sql_show.cc Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb 2006-09-22 21:14:58 +02:00
sql_show.h
sql_sort.h
sql_state.c
sql_string.cc Merge salvation.intern.azundris.com:/home/tnurnberg/21913/my50-21913 2006-09-05 22:55:55 +02:00
sql_string.h
sql_table.cc This changes the order of the universe, black is now the new white. 2006-09-15 10:28:00 -07:00
sql_tablespace.cc
sql_test.cc WL#3337 (Event scheduler new architecture) 2006-09-12 12:26:12 +02:00
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 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 dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02: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 dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt 2006-09-18 12:57:20 +02:00
stacktrace.c Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx 2006-09-07 00:59:08 +02:00
stacktrace.h Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx 2006-09-07 00:59:08 +02:00
strfunc.cc
structs.h WL#3146 "less locking in auto_increment": 2006-07-09 17:52:19 +02:00
table.cc Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 2006-09-15 10:48:30 -07:00
table.h correct prototype 2006-09-12 13:24:07 +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 Cleanup patch. 2006-08-17 18:13:45 +02:00
tztime.h
udf_example.c Windows 64bit fixes 2006-09-21 15:19:20 +02:00
udf_example.def Windows 64bit fixes 2006-09-21 15:19:20 +02: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