database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity
Files
37b79d90d3b46122ef42f1fec342e895664ec71c
mariadb/sql
History
unknown 37b79d90d3 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


client/mysql.cc:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp:
  Auto merged
mysql-test/r/information_schema.result:
  manual merge
mysql-test/t/information_schema.test:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/include/ndbapi/ndb_cluster_connection.hpp:
  manual merge
storage/ndb/src/ndbapi/DictCache.cpp:
  manual merge
2006-05-16 10:37:40 +02:00
..
share
Fixed compiler warnings
2006-05-04 19:39:47 +03:00
.cvsignore
…
add_errmsg
…
authors.h
Andrei Elkin has arrived.
2006-04-01 14:17:01 +03:00
client_settings.h
…
CMakeLists.txt
performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1.
2006-05-11 11:29:08 -05:00
custom_conf.h
…
derror.cc
…
des_key_file.cc
Many files:
2005-09-30 14:03:55 +02:00
discover.cc
WL#1324 table name to file name encoding
2005-12-31 09:01:26 +04:00
event_executor.cc
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
event_priv.h
class event_timed -> Event_timed
2006-02-28 18:33:38 +01:00
event_timed.cc
Fixed compiler warnings
2006-05-04 19:39:47 +03:00
event.cc
manual merge
2006-04-07 09:18:29 +02:00
event.h
fix for bug 16408 (Events: crash for an event in a procedure)
2006-03-16 13:14:40 +01:00
field_conv.cc
Re commit of previous fix as the bk tree was broken.
2006-03-14 17:46:25 +02:00
field.cc
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-04-11 14:26:06 +02:00
field.h
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 20:18:12 -07:00
filesort.cc
Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
2005-10-14 00:04:52 +03:00
frm_crypt.cc
…
gen_lex_hash.cc
…
gstream.cc
…
gstream.h
…
ha_berkeley.cc
Fixed compiler warnings
2006-05-04 19:39:47 +03:00
ha_berkeley.h
Merge mysql.com:/home/jimw/my/mysql-5.1-14880
2005-12-05 18:09:42 -08:00
ha_federated.cc
WL#3201 additional post-review fixes
2006-05-02 04:11:00 -07:00
ha_federated.h
merged
2006-03-06 23:20:19 +01:00
ha_heap.cc
Fixed compiler warnings
2006-05-04 19:39:47 +03:00
ha_heap.h
Merge mysql.com:/home/kostja/mysql/tmp_merge
2006-02-08 23:53:45 +03:00
ha_innodb.cc
Fixed compiler warnings
2006-05-04 19:39:47 +03:00
ha_innodb.h
After merge fixes.
2006-04-21 14:21:17 -04:00
ha_myisam.cc
Fix, or a workaround for Bug#19386 "Multiple alter causes crashed table"
2006-05-15 19:41:04 +03:00
ha_myisam.h
Fix the tree: plugin-related changes, necessary for
2006-01-20 00:40:56 +03:00
ha_myisammrg.cc
manual merge bug#10952
2006-05-12 08:50:31 -07:00
ha_myisammrg.h
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
ha_ndbcluster_binlog.cc
ndb: added extra printout on failed "internal" discovery for binlog
2006-05-10 16:54:29 +02:00
ha_ndbcluster_binlog.h
removing the usage if the ndb local dict cache to adress the 241 errors we get now and then
2006-05-04 13:58:17 +02:00
ha_ndbcluster_tables.h
Bug #17805 Cluster_replication database should be renamed to just cluster
2006-03-01 13:31:21 +01:00
ha_ndbcluster.cc
correction of merge
2006-05-15 20:29:50 +02:00
ha_ndbcluster.h
ndb:
2006-05-04 15:55:38 +02:00
ha_partition.cc
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
2006-05-12 12:22:31 -04:00
ha_partition.h
BUG#19502: Enable/Disable index routines not working for partitioned handlers
2006-05-04 15:15:25 -04:00
handler.cc
Don't use row level logging on optimize or repair table.
2006-05-05 20:08:40 +03:00
handler.h
manual merge bug#10952
2006-05-12 08:50:31 -07:00
hash_filo.cc
…
hash_filo.h
…
hostname.cc
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
init.cc
WL#1324 table name to file name encoding
2005-12-31 09:01:26 +04:00
item_buff.cc
…
item_cmpfunc.cc
Merge mysql.com:/home/elkin/MySQL/BARE/5.0
2006-04-25 20:05:15 +03:00
item_cmpfunc.h
Fix compile failure on Win32
2006-04-26 01:21:33 +04:00
item_create.cc
Merge mysql.com:/opt/local/work/tmp_merge
2006-04-23 04:04:36 +04:00
item_create.h
Adding XPath support: ExtractValue and UpdateXML functions.
2005-12-21 17:13:52 +04:00
item_func.cc
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
2006-05-12 08:45:22 +02:00
item_func.h
Fixed memory leak in sql_parse.cc (lex_end() was not called)
2006-05-04 15:30:38 +03:00
item_geofunc.cc
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2005-10-31 11:54:36 +02:00
item_geofunc.h
…
item_row.cc
Merge mysql.com:/opt/local/work/mysql-4.1-16365
2006-04-12 18:30:54 +04:00
item_row.h
Merge mysql.com:/opt/local/work/mysql-4.1-16365
2006-04-12 18:30:54 +04:00
item_strfunc.cc
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-16 10:37:40 +02:00
item_strfunc.h
Bug #17043: Casting trimmed string to decimal loses precision
2006-03-14 02:04:43 -08:00
item_subselect.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-30 13:27:38 -07:00
item_subselect.h
Fix bug #15706 find_field_in_tables() returns field from outer select
2006-02-15 19:45:06 +03:00
item_sum.cc
Manually merged
2006-04-25 13:04:39 +04:00
item_sum.h
Post merge fix
2006-04-20 00:42:12 -07:00
item_timefunc.cc
Bug#18997: DATE_ADD and DATE_SUB perform year2K autoconversion magic on 4-digit year value
2006-05-16 03:32:24 +02:00
item_timefunc.h
Merge april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
2006-04-24 19:53:38 +05:00
item_uniq.cc
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
item_uniq.h
Inefficient usage of String::append() fixed.
2005-11-20 20:47:07 +02:00
item_xmlfunc.cc
Merge mysql.com:/usr/home/bar/mysql-5.1-new
2006-05-03 09:08:12 +05:00
item_xmlfunc.h
Adding XPath support: ExtractValue and UpdateXML functions.
2005-12-21 17:13:52 +04:00
item.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-30 13:27:38 -07:00
item.h
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-30 13:27:38 -07:00
key.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 20:18:12 -07:00
lex_symbol.h
…
lex.h
Added support for key_block_size for key and table level (WL#602)
2006-05-03 15:59:17 +03:00
lock.cc
Manually merged
2006-04-25 13:04:39 +04:00
log_event.cc
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
2006-05-11 11:14:15 +02:00
log_event.h
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
log.cc
Merge
2006-05-12 14:16:20 +05:00
log.h
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
Makefile.am
Rename cmakelists.txt -> CMakeLists.txt
2006-05-12 10:51:07 +02:00
matherr.c
…
message.mc
Some changes to make it possible to build for Windows with CMake from
2006-03-24 22:50:56 +01:00
mf_iocache.cc
…
my_decimal.cc
Moved long running query to type_newdecimal-big.test
2005-11-23 20:16:06 +02:00
my_decimal.h
Fix for bug #13573 (wrong data inserted for too big decimals)
2005-10-15 21:57:32 +05:00
my_lock.c
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
mysql_priv.h
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
2006-05-12 08:45:22 +02:00
mysqld_suffix.h
…
mysqld.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-05-16 10:21:37 +02:00
net_serv.cc
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
nt_servc.cc
…
nt_servc.h
…
opt_range.cc
Merge mysql.com:/home/psergey/tmp_merge3
2006-05-13 22:40:26 +04:00
opt_range.h
Merge mysql.com:/home/kostja/mysql/tmp_merge
2006-02-02 16:57:34 +03:00
opt_sum.cc
Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0
2006-04-07 11:23:55 +02:00
parse_file.cc
Merge zim.(none):/home/ian/workspace/mysql-5.0
2006-03-27 19:48:44 -08:00
parse_file.h
Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created
2006-03-28 01:01:51 +04:00
partition_element.h
WL 2826: Error handling of ALTER TABLE for partitioning
2006-03-24 18:19:13 -05:00
partition_info.cc
Merge xiphis.org:/home/antony/work2/wl3201.3
2006-04-24 13:36:15 -07:00
partition_info.h
BUG#19010: Fix issues with that ALTER TABLE from auto-partitioned NDB table doesn't work unless primary key exists on table.
2006-05-10 12:53:40 -04:00
password.c
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
procedure.cc
…
procedure.h
…
protocol.cc
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02:00
protocol.h
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02:00
records.cc
Many files:
2005-12-01 13:34:48 +01:00
repl_failsafe.cc
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
2006-05-01 11:38:15 -07:00
repl_failsafe.h
pthread_handler_decl() changed to be ctags-friendly
2005-10-08 16:39:55 +02:00
rpl_filter.cc
Fix for BUG#15018 "valgrind error in Rpl_filter (uninitalized memory - could crash)".
2005-11-17 15:58:55 +01:00
rpl_filter.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
rpl_injector.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-03-11 07:26:58 +01:00
rpl_injector.h
wl#3023 clean up
2006-03-11 15:52:38 +01:00
rpl_rli.h
Plugging memory leak in row-based replication triggered by
2006-05-09 12:30:06 +02:00
rpl_tblmap.cc
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
rpl_tblmap.h
Compile fixes for aix52-64bit.
2006-01-01 22:18:02 +01:00
set_var.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-05-15 20:35:17 +02:00
set_var.h
Merge mysql.com:/opt/local/work/tmp_merge
2006-04-19 21:12:24 +04:00
slave.cc
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
slave.h
Merge mysql.com:/home/kostja/mysql/tmp_merge
2006-02-02 16:57:34 +03:00
sp_cache.cc
Remove unused variable
2006-03-28 19:34:44 +02:00
sp_cache.h
…
sp_head.cc
After-merge fixes.
2006-05-15 18:41:05 +02:00
sp_head.h
Merge mysql.com:/usr/local/mysql/mysql-5.0-bug19633
2006-05-15 18:41:04 +02:00
sp_pcontext.cc
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
sp_pcontext.h
Fixed BUG#18949: Test case sp-goto is disabled
2006-04-18 11:07:34 +02:00
sp_rcontext.cc
BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes().
2006-05-15 12:01:55 +02:00
sp_rcontext.h
BUG#18037: Fix stack corruption in THD::rollback_item_tree_changes().
2006-05-15 12:01:55 +02:00
sp.cc
Merge mysql.com:/home/my/mysql-5.0
2006-05-04 15:58:30 +03:00
sp.h
Fixed BUG#16303: erroneus stored procedures and functions should be droppable
2006-01-26 13:29:46 +01:00
spatial.cc
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
2005-11-21 21:15:48 +02:00
spatial.h
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
sql_acl.cc
Merge bk-internal:/home/bk/mysql-5.1-new
2006-05-12 11:51:04 +02:00
sql_acl.h
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
2006-05-11 11:28:56 +04:00
sql_analyse.cc
Fixed compiler and valgrind warnings
2006-03-29 14:27:36 +03:00
sql_analyse.h
…
sql_array.h
…
sql_base.cc
Merge
2006-05-12 14:16:20 +05:00
sql_binlog.cc
fixed BINLOG crashes in case of badly formed statement (Bug #17457)
2006-03-01 12:45:13 +02:00
sql_bitmap.h
…
sql_builtin.cc.in
WL#3201
2006-04-13 13:49:29 -07:00
sql_cache.cc
Merge mysql.com:/home/alexi/bugs/mysql-5.0-15758-work
2006-04-09 17:48:47 +04:00
sql_cache.h
Fixed compiler warnings from gcc 4.0.2:
2006-02-25 17:46:30 +02:00
sql_class.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-05-16 10:21:37 +02:00
sql_class.h
Merge
2006-05-12 14:16:20 +05:00
sql_client.cc
…
sql_crypt.cc
…
sql_crypt.h
…
sql_cursor.cc
Fixed BUG#15758: "Holding adaptive search latch in
2006-04-07 23:58:17 +04:00
sql_cursor.h
A fix and a test case for Bug#6513 "Test Suite: Values inserted by using
2005-09-22 02:11:21 +04:00
sql_db.cc
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-01 15:49:50 +01:00
sql_delete.cc
WL#3201
2006-04-13 13:49:29 -07:00
sql_derived.cc
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
sql_do.cc
…
sql_error.cc
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-03-23 18:14:02 +01:00
sql_error.h
…
sql_handler.cc
Remove unused variable
2006-04-11 12:15:57 +02:00
sql_help.cc
Merge mysql.com:/home/kostja/mysql/tmp_merge
2006-02-02 16:57:34 +03:00
sql_insert.cc
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
sql_lex.cc
Post-merge fixes.
2006-05-07 16:14:43 -07:00
sql_lex.h
Fixed bug #14927.
2006-05-06 23:48:13 -07:00
sql_list.cc
…
sql_list.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_load.cc
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
sql_manager.cc
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
sql_manager.h
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
sql_map.cc
Bug fix for bug #15843 "Added mmap support in myisam creates compile problem
2005-12-19 14:16:21 +01:00
sql_map.h
…
sql_olap.cc
…
sql_parse.cc
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-05-15 20:35:17 +02:00
sql_partition.cc
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140
2006-05-12 15:44:15 -04:00
sql_partition.h
BUG#18558 "Partition pruning results are incorrect for certain class of WHERE clauses" :
2006-04-06 21:23:33 +04:00
sql_plugin.cc
WL#3201
2006-04-24 14:32:45 -07:00
sql_plugin.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
2006-02-14 22:57:12 +01:00
sql_prepare.cc
Merge mysql.com:/home/psergey/tmp_merge2
2006-05-11 20:44:31 +04:00
sql_rename.cc
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-27 20:00:07 +03:00
sql_repl.cc
Merge mysql.com:/home/emurphy/src/mysql/bk-clean/tmp_merge2
2006-04-21 13:20:15 -04:00
sql_repl.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_select.cc
Merge mysql.com:/home/psergey/tmp_merge3
2006-05-13 22:40:26 +04:00
sql_select.h
Merge mysql.com:/home/dlenev/src/mysql-5.0-bg13525
2006-02-27 20:00:07 +03:00
sql_show.cc
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-16 10:37:40 +02:00
sql_show.h
WL#1012: All changes as one single changeset.
2005-12-22 06:39:02 +01:00
sql_sort.h
…
sql_state.c
…
sql_string.cc
Fix spelling in comments as requested by Osku
2006-05-02 09:13:58 -04:00
sql_string.h
Netware specific changes.
2005-12-14 01:21:56 +02:00
sql_table.cc
Merge bk-internal:/home/bk/mysql-5.1-new
2006-05-12 17:40:58 -07:00
sql_tablespace.cc
bug#18604 create logfile for MyISAM tables
2006-04-24 18:26:30 +02:00
sql_test.cc
Merge mysql.com:/home/my/mysql-5.0
2006-05-04 22:27:12 +03:00
sql_trigger.cc
Merge zim.(none):/home/ian/workspace/mysql-5.0
2006-03-27 19:48:44 -08:00
sql_trigger.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
2006-02-26 16:38:48 +03:00
sql_udf.cc
Bug#11835 CREATE FUNCTION crashes server
2006-03-21 10:54:26 +01:00
sql_udf.h
…
sql_union.cc
Manually merged
2006-04-25 13:04:39 +04:00
sql_update.cc
Manually merged
2006-04-05 20:12:26 +04:00
sql_view.cc
Fixed wrong merge
2006-05-05 13:10:42 +03:00
sql_view.h
Finalize storage engine plugins
2005-12-21 10:18:40 -08:00
sql_yacc.yy
don't introduce a deprecated syntax
2006-05-08 16:06:16 -04:00
stacktrace.c
…
stacktrace.h
…
strfunc.cc
Making old tables seen with "#mysql50#" prefix,
2005-12-31 12:34:39 +04:00
structs.h
Added support for key_block_size for key and table level (WL#602)
2006-05-03 15:59:17 +03:00
table.cc
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
2006-05-12 12:22:31 -04:00
table.h
Merge mysql.com:/home/psergey/tmp_merge3
2006-05-13 22:40:26 +04:00
thr_malloc.cc
…
time.cc
fix for bug #17494 (The algorithm for calculating execution times is not fully correct)
2006-04-07 09:08:58 +02:00
tzfile.h
…
tztime.cc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2006-05-02 18:41:42 -04:00
tztime.h
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2006-05-02 18:41:42 -04:00
udf_example.cc
Fix small bug in udf_example.cc, it was processing one char too much and thus returning junk
2006-04-28 11:37:20 +02:00
uniques.cc
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
unireg.cc
Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
2006-05-12 12:22:31 -04:00
unireg.h
Fixed bug#14169: type of group_concat() result changed to blob if tmp_table was
2006-04-12 23:05:38 +04:00