mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 60758fb17d Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug24404 
into  moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug24404


sql/sql_view.cc:
  Auto merged
mysql-test/r/view_grant.result:
  Manual merge.
mysql-test/t/view_grant.test:
  Manual merge.
2007-01-18 12:57:34 +03:00
..
examples Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
share Merge mysql.com:/d2/hf/clean/my51-clean 2006-12-31 12:41:42 +04:00
.cvsignore
add_errmsg
authors.h Many files: 2006-12-31 02:29:11 +01:00
client_settings.h
CMakeLists.txt Fixed windows build break 2007-01-12 10:33:44 -07:00
contributors.h Many files: 2006-12-31 02:29:11 +01:00
custom_conf.h
derror.cc
des_key_file.cc
discover.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
event_data_objects.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 2007-01-02 14:18:13 -07:00
event_data_objects.h
event_db_repository.cc
event_db_repository.h
event_queue.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 2007-01-02 14:18:13 -07:00
event_queue.h
event_scheduler.cc
event_scheduler.h
events.cc
events.h
field.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
field.h Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-01-10 14:14:22 +04:00
field_conv.cc
filesort.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc
ha_ndbcluster.h
ha_ndbcluster_binlog.cc
ha_ndbcluster_binlog.h
ha_ndbcluster_tables.h
ha_partition.cc
ha_partition.h
handler.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 2007-01-02 14:18:13 -07:00
handler.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
hash_filo.cc
hash_filo.h
hostname.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
init.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
item.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-01-12 14:48:59 +04:00
item.h Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-01-12 08:11:52 -07:00
item_buff.cc
item_cmpfunc.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-01-10 14:14:22 +04:00
item_cmpfunc.h Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-01-10 14:14:22 +04:00
item_create.cc
item_create.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
item_func.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-12 22:06:46 +03:00
item_func.h Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-01-10 14:14:22 +04:00
item_geofunc.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc Merge mysql.com:/d2/hf/clean/my51-clean 2006-12-31 12:41:42 +04:00
item_strfunc.h
item_subselect.cc Merge macbook.local:/Users/kgeorge/mysql/work/mysql-5.0-opt 2007-01-08 12:32:48 +02:00
item_subselect.h Merge macbook.local:/Users/kgeorge/mysql/work/mysql-5.0-opt 2007-01-08 12:32:48 +02:00
item_sum.cc
item_sum.h Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-01-12 08:11:52 -07:00
item_timefunc.cc
item_timefunc.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
item_xmlfunc.cc Many files: 2006-12-31 02:29:11 +01:00
item_xmlfunc.h
key.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
lex.h Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-01-12 08:11:52 -07:00
lex_symbol.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
lock.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 2007-01-02 14:18:13 -07:00
log.cc
log.h
log_event.cc
log_event.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
Makefile.am Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-01-12 08:11:52 -07:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
my_decimal.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
my_lock.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
mysql_priv.h Manual merge. 2007-01-15 13:10:07 +03:00
mysqld.cc Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 2007-01-17 20:47:50 +03:00
mysqld.cc.rej
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
opt_range.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
opt_sum.cc
parse_file.cc
parse_file.h
partition_element.h Many files: 2006-12-31 02:29:11 +01:00
partition_info.cc
partition_info.h Many files: 2006-12-31 02:29:11 +01:00
password.c Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
procedure.cc
procedure.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
protocol.cc
protocol.h
records.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
repl_failsafe.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc Many files: 2006-12-31 02:29:11 +01:00
rpl_injector.h Many files: 2006-12-31 02:29:11 +01:00
rpl_mi.cc
rpl_mi.h
rpl_rli.cc
rpl_rli.h
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc Many files: 2006-12-31 02:29:11 +01:00
rpl_utility.h Many files: 2006-12-31 02:29:11 +01:00
set_var.cc Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-01-11 09:15:44 -07:00
set_var.h Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 2007-01-02 14:18:13 -07:00
slave.cc
slave.h
sp.cc
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-11 21:59:28 +03:00
sp_head.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-11 21:59:28 +03:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_acl.cc
sql_acl.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_analyse.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_analyse.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_array.h
sql_base.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 2007-01-12 14:48:59 +04:00
sql_binlog.cc Many files: 2006-12-31 02:29:11 +01:00
sql_bitmap.h
sql_builtin.cc.in Many files: 2006-12-31 02:29:11 +01:00
sql_cache.cc
sql_cache.h
sql_class.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-11 21:59:28 +03:00
sql_class.h Manual merge. 2007-01-15 13:10:07 +03:00
sql_client.cc
sql_crypt.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_crypt.h
sql_cursor.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_cursor.h
sql_db.cc
sql_delete.cc
sql_derived.cc
sql_do.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc Manual merge. 2007-01-15 13:10:07 +03:00
sql_lex.cc Manual merge. 2007-01-15 13:10:07 +03:00
sql_lex.h Manual merge. 2007-01-15 13:10:07 +03:00
sql_list.cc
sql_list.h Manual merge. 2007-01-15 13:10:07 +03:00
sql_load.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_locale.cc
sql_manager.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_map.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_map.h
sql_olap.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_parse.cc Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 2007-01-17 16:00:33 +03:00
sql_parse.cc.rej
sql_partition.cc Merge mysql.com:/home/hf/work/24502/my51-24502 2007-01-10 16:23:54 +04:00
sql_partition.h
sql_plugin.cc
sql_plugin.h
sql_prepare.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-11 22:15:20 +03:00
sql_rename.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_repl.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_repl.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_select.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 2007-01-15 13:48:07 +03:00
sql_select.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_servers.cc
sql_servers.h Many files: 2006-12-31 02:29:11 +01:00
sql_show.cc Manual merge. 2007-01-15 13:10:07 +03:00
sql_show.h Many files: 2006-12-31 02:29:11 +01:00
sql_sort.h
sql_state.c
sql_string.cc Merge bodhi.local:/opt/local/work/tmp_merge 2007-01-15 23:51:52 +03:00
sql_string.h
sql_table.cc Manual merge. 2007-01-15 13:10:07 +03:00
sql_tablespace.cc
sql_test.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_trigger.cc
sql_trigger.h
sql_udf.cc Merge macbook.local:/Users/kgeorge/mysql/work/mysql-5.0-opt 2007-01-08 12:32:48 +02:00
sql_udf.h
sql_union.cc
sql_update.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
sql_view.cc Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug24404 2007-01-18 12:57:34 +03:00
sql_view.h
sql_yacc.yy Manual merge. 2007-01-15 13:10:07 +03:00
sql_yacc.yy.bak
stacktrace.c
stacktrace.h
strfunc.cc
structs.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
table.cc Bug#24660: "enum" field type definition problem 2007-01-12 11:06:38 +01:00
table.cc.rej
table.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
thr_malloc.cc
time.cc Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00
tzfile.h
tztime.cc
tztime.h
udf_example.c
udf_example.def
uniques.cc
unireg.cc Bug#24660: "enum" field type definition problem 2007-01-12 11:06:38 +01:00
unireg.h Merge mysql.com:/home/kent/bk/main/mysql-5.0 2006-12-31 01:32:21 +01:00