mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 7c9da59b70 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbIndexStat.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
2007-01-30 19:45:44 +01:00
..
examples
share Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-22 19:18:22 +02:00
.cvsignore
add_errmsg
authors.h
client_settings.h
CMakeLists.txt Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-17 19:32:14 +01:00
contributors.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
event_data_objects.cc
event_data_objects.h
event_db_repository.cc
event_db_repository.h
event_queue.cc Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 2007-01-18 08:30:35 -07:00
event_queue.h
event_scheduler.cc
event_scheduler.h
events.cc
events.h
field.cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 2007-01-19 08:54:10 +04:00
field.h Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 2007-01-18 10:30:39 -07:00
field_conv.cc
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_ndbcluster.cc Merge perch.ndb.mysql.com:/home/jonas/src/51-work 2007-01-30 19:45:44 +01:00
ha_ndbcluster.h Bug#25567 records() call performs scan in NDB, performance bug 2007-01-24 00:27:19 +11:00
ha_ndbcluster_binlog.cc
ha_ndbcluster_binlog.h
ha_ndbcluster_tables.h
ha_partition.cc bug #24186 (nested query across partitions returns fewer records) 2007-01-12 15:46:20 +04:00
ha_partition.h
handler.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-22 19:18:22 +02:00
handler.h
hash_filo.cc
hash_filo.h
hostname.cc
init.cc
item.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-01-24 19:54:40 +04:00
item.h Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt 2007-01-26 16:46:01 +04:00
item_buff.cc
item_cmpfunc.cc Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 2007-01-24 22:28:28 +03:00
item_cmpfunc.h Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 2007-01-24 22:28:28 +03:00
item_create.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
item_create.h
item_func.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-01-24 19:54:40 +04:00
item_func.h Bug #6172: RAND(a) should only accept constant values as arguments 2007-01-23 19:45:58 +02:00
item_geofunc.cc
item_geofunc.h
item_row.cc
item_row.h
item_strfunc.cc merge of 5.0-opt -> 5.1-opt 2007-01-24 15:55:16 +02:00
item_strfunc.h merge of 5.0-opt -> 5.1-opt 2007-01-24 15:55:16 +02:00
item_subselect.cc Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 2007-01-24 22:28:28 +03:00
item_subselect.h Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 2007-01-24 22:28:28 +03:00
item_sum.cc
item_sum.h Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 2007-01-18 08:30:35 -07:00
item_timefunc.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
item_timefunc.h
item_xmlfunc.cc
item_xmlfunc.h
key.cc
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
lock.cc
log.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
log.h Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
log_event.cc Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 2007-01-18 10:30:39 -07:00
log_event.h Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
Makefile.am Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-01-24 14:43:09 -07:00
matherr.c
message.mc
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 2007-01-24 22:28:28 +03:00
mysqld.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt 2007-01-26 16:46:01 +04:00
mysqld.cc.rej
mysqld_suffix.h
net_serv.cc
nt_servc.cc
nt_servc.h
opt_range.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-11 09:43:44 -05:00
opt_range.h
opt_sum.cc
parse_file.cc
parse_file.h
partition_element.h
partition_info.cc
partition_info.h
password.c
procedure.cc
procedure.h
protocol.cc
protocol.h
records.cc
repl_failsafe.cc
repl_failsafe.h
rpl_filter.cc
rpl_filter.h
rpl_injector.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
rpl_injector.h Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
rpl_mi.cc
rpl_mi.h
rpl_rli.cc
rpl_rli.h
rpl_tblmap.cc
rpl_tblmap.h
rpl_utility.cc
rpl_utility.h
set_var.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-17 19:32:14 +01:00
set_var.h Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-17 19:32:14 +01:00
slave.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
slave.h
sp.cc
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-17 19:32:14 +01:00
sp_head.h Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-17 19:32:14 +01:00
sp_pcontext.cc
sp_pcontext.h
sp_rcontext.cc
sp_rcontext.h
spatial.cc
spatial.h
sql_acl.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
sql_acl.h
sql_analyse.cc
sql_analyse.h
sql_array.h
sql_base.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-01-24 19:54:40 +04:00
sql_binlog.cc
sql_bitmap.h
sql_builtin.cc.in
sql_cache.cc
sql_cache.h
sql_class.cc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-24 09:13:47 +07:00
sql_class.h Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-17 19:32:14 +01:00
sql_client.cc
sql_crypt.cc
sql_crypt.h
sql_cursor.cc
sql_cursor.h
sql_db.cc
sql_delete.cc Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-opt 2007-01-23 12:34:50 +02:00
sql_derived.cc
sql_do.cc
sql_error.cc
sql_error.h
sql_handler.cc
sql_help.cc
sql_insert.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-01-24 19:54:40 +04:00
sql_lex.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1 2007-01-24 19:54:40 +04:00
sql_lex.h Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 2007-01-24 22:28:28 +03:00
sql_list.cc
sql_list.h Manual merge. 2007-01-15 13:10:07 +03:00
sql_load.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
sql_locale.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 2007-01-12 12:31:44 +01:00
sql_manager.cc
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Fix merge problem. 2007-01-18 18:02:58 -05: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 mysql.com:/home/gluh/MySQL/Merge/5.1 2007-01-24 19:54:40 +04:00
sql_rename.cc
sql_repl.cc
sql_repl.h
sql_select.cc Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 2007-01-25 02:30:36 +03:00
sql_select.h Merge mysql.com:/home/psergey/mysql-5.0-bug8804-r12 2007-01-24 22:28:28 +03:00
sql_servers.cc
sql_servers.h
sql_show.cc Manual merge. 2007-01-15 13:10:07 +03:00
sql_show.h
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 Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt 2007-01-26 16:46:01 +04:00
sql_tablespace.cc
sql_test.cc
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 Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-opt 2007-01-23 12:34:50 +02:00
sql_update.cc Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt 2007-01-26 16:46:01 +04:00
sql_view.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-01-24 19:26:06 +03:00
sql_view.h
sql_yacc.yy Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 2007-01-24 14:43:09 -07:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h
table.cc Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 2007-01-25 01:44:30 +04:00
table.cc.rej
table.h Bug#21713 incorrect value for the REFERENTIAL_CONSTRAINTS.UNIQUE_CONSTRAINT_NAME column 2007-01-15 13:39:28 +04:00
thr_malloc.cc
time.cc
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