mariadb/sql
unknown e6297be853 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main


sql/ha_ndbcluster.cc:
  Auto merged
2006-06-29 22:54:49 +02:00
..
examples Fix for bug #15558: truncate doesn't clear table on archive storage engine tables. 2006-05-18 17:10:58 +05:00
share Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX 2006-05-30 00:08:58 -07:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc
discover.cc
field.cc Fixed bug #14896. 2006-06-22 00:29:04 +04:00
field.h field.cc, field.h: 2006-06-21 01:14:53 +04:00
field_conv.cc Fix for BUG#18587: Function that accepts and returns TEXT 2006-05-10 23:16:30 +04:00
filesort.cc
frm_crypt.cc
gen_lex_hash.cc
gstream.cc
gstream.h
ha_archive.cc Manually merged 2006-06-17 02:57:50 +04:00
ha_archive.h Dean noticed that constant flush calls caused the archive stream file to flush empty buffers. This patch removes that behavior. 2006-04-20 18:23:04 -07:00
ha_berkeley.cc
ha_berkeley.h
ha_blackhole.cc bug#10952 2006-05-09 13:31:46 -07:00
ha_blackhole.h
ha_federated.cc Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 2006-06-28 10:11:43 -07:00
ha_federated.h BUG #19773 2006-06-28 12:18:21 -07:00
ha_heap.cc Manual merge 2006-03-30 17:14:55 +04:00
ha_heap.h Merge mysql.com:/opt/local/work/mysql-4.1-root 2006-02-02 18:17:18 +03:00
ha_innodb.cc Applying patch from SergeyV 2006-06-20 13:43:13 -04:00
ha_innodb.h foo2 2006-04-13 17:22:56 +09:30
ha_myisam.cc bug #15860 (SPATIAL keys in INNODB) 2006-04-12 22:05:23 +05:00
ha_myisam.h
ha_myisammrg.cc bug#10952 2006-05-09 13:31:46 -07:00
ha_myisammrg.h Bug#19648 2006-05-30 17:10:53 -07:00
ha_ndbcluster.cc Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 2006-06-29 22:54:49 +02:00
ha_ndbcluster.h Fix for Bug #19906 REPLACE doesn't update TEXT fields correctly 2006-06-21 09:36:50 +02:00
handler.cc foo2 2006-04-13 17:22:56 +09:30
handler.h Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table 2006-06-02 07:26:45 +02:00
hash_filo.cc
hash_filo.h
hostname.cc Merge mysql.com:/usr/home/ram/work/mysql-4.1 2006-03-03 15:32:00 +04:00
init.cc
item.cc Merge rurik.mysql.com:/home/igor/mysql-5.0 2006-05-18 11:30:42 -07:00
item.h Manually merged 2006-06-14 23:54:08 +04:00
item_buff.cc Fix for bug#19667 group by a decimal expression yields wrong result 2006-06-15 16:24:02 +05:00
item_cmpfunc.cc Manually merged 2006-06-20 23:22:51 +04:00
item_cmpfunc.h item_cmpfunc.h, cast.result: 2006-06-15 16:39:18 +04:00
item_create.cc Bug#16461: connection_id() does not work properly inside trigger 2006-04-12 19:31:00 +04:00
item_create.h
item_func.cc Manually merged 2006-06-17 02:57:50 +04:00
item_func.h After-merge fixes; some function signatures changed from Item * to Item **. 2006-05-15 19:57:10 +02:00
item_geofunc.cc
item_geofunc.h merging 2006-06-26 22:32:02 +05:00
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 bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 2006-06-27 00:52:56 +04:00
item_strfunc.h Bug#19599 duplication of information_schema column value in a CONCAT expr with user var 2006-06-06 12:51:04 +05:00
item_subselect.cc Bug #19700: subselect returning BIGINT always returned it as SIGNED 2006-05-25 10:39:18 +03:00
item_subselect.h BUG#7549: Missing error message for invalid view selection with subquery. 2006-05-11 15:30:54 +03:00
item_sum.cc Post merge fix 2006-04-20 00:42:12 -07:00
item_sum.h Post merge fix 2006-04-20 00:42:12 -07:00
item_timefunc.cc Manually merged 2006-06-17 02:11:12 +04:00
item_timefunc.h Manually merged 2006-06-17 02:11:12 +04:00
item_uniq.cc
item_uniq.h
key.cc Bug #13601: Wrong int type for bit 2006-04-04 17:54:58 -07:00
lex.h Fixed BUG#18949: Test case sp-goto is disabled 2006-04-18 11:07:34 +02:00
lex_symbol.h
lock.cc Bug#16986 - Deadlock condition with MyISAM tables 2006-06-26 19:14:35 +02:00
log.cc Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit 2006-06-12 08:54:45 -04:00
log_event.cc Fix compilation failures on Windows caused by the patch for Bug#17199. 2006-06-27 14:56:24 +04:00
log_event.h Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit 2006-06-12 08:54:45 -04:00
Makefile.am Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init 2006-05-31 16:19:06 +02:00
matherr.c
mf_iocache.cc
my_decimal.cc
my_decimal.h
my_lock.c
mysql_priv.h Merge mysql.com:/home/mydev/mysql-5.0--main 2006-06-26 19:19:12 +02:00
mysqld.cc Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 2006-06-26 16:56:28 +02:00
mysqld_suffix.h
net_serv.cc configure.in, net_serv.cc, compile-netware-END: 2006-06-17 00:30:02 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge mysql.com:/home/kgeorge/mysql/4.1/B4981 2006-06-02 15:35:40 +03:00
opt_range.h
opt_sum.cc Merge may.pils.ru:/home/svoj/devel/mysql/BUG20357/mysql-4.1 2006-06-21 19:41:09 +05:00
parse_file.cc Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created 2006-03-28 01:01:51 +04:00
parse_file.h Fix for BUG#15921: DROP TRIGGER - can't be drop trigger created 2006-03-28 01:01:51 +04:00
password.c
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
repl_failsafe.cc Bug #18607: LOAD DATA FROM MASTER fails because of INFORMATION_SCHEMA database 2006-04-21 18:26:39 -07:00
repl_failsafe.h
set_var.cc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 2006-06-28 14:23:33 +05:00
set_var.h Fix yet another place with an obsolete explicit cast to byte *. 2006-06-27 15:39:43 +04:00
slave.cc Fix yet another place that used uint32 instead of uint. 2006-06-27 17:34:14 +04:00
slave.h Fix yet another place that used uint32 instead of uint. 2006-06-27 17:34:14 +04:00
sp.cc A fix and a test case for 2006-06-27 00:47:52 +04:00
sp.h A fix and a test case for 2006-06-27 00:47:52 +04:00
sp_cache.cc
sp_cache.h
sp_head.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 2006-06-27 00:52:56 +04:00
sp_head.h A fix and a test case for 2006-06-27 00:47:52 +04: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
spatial.cc
spatial.h Fixed compiler warnings from gcc 4.0.2: 2006-02-25 17:46:30 +02:00
sql_acl.cc Bug#19857: When a user with CREATE ROUTINE priv creates a routine it results in NULL p/w 2006-06-28 12:40:17 +02:00
sql_acl.h Reapply fix for bug#16372 (Server crashes when test 'conc_sys' is running) 2006-05-06 11:25:59 +04:00
sql_analyse.cc Porting fix that allows others to include compiled code with different parsers. 2006-03-09 10:09:52 -08:00
sql_analyse.h
sql_array.h
sql_base.cc Merge mysql.com:/home/mydev/mysql-5.0--main 2006-06-26 19:19:12 +02:00
sql_bitmap.h
sql_cache.cc Fixed BUG#15758: "Holding adaptive search latch in 2006-04-07 23:58:17 +04:00
sql_cache.h Fixed compiler warnings from gcc 4.0.2: 2006-02-25 17:46:30 +02:00
sql_class.cc Remove deadcode in select_dumpvar::send_data() 2006-06-21 02:21:10 +04:00
sql_class.h Fix compilation failures on Windows caused by the patch for Bug#17199. 2006-06-27 14:56:24 +04: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
sql_db.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 2006-06-27 00:52:56 +04:00
sql_delete.cc BUG#18681: View privileges are broken 2006-05-26 11:47:53 +03:00
sql_derived.cc
sql_do.cc
sql_error.cc Add extre DBUG_PRINT in push_warning 2006-03-16 12:06:39 +01:00
sql_error.h
sql_handler.cc Bug#16986 - Deadlock condition with MyISAM tables 2006-06-26 19:14:35 +02:00
sql_help.cc
sql_insert.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-06-27 03:34:12 +04:00
sql_lex.cc Merge bk-internal:/home/bk/mysql-5.0 2006-06-02 21:41:57 +02:00
sql_lex.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 2006-06-27 00:52:56 +04:00
sql_list.cc
sql_list.h
sql_load.cc BUG#18681: View privileges are broken 2006-05-26 11:47:53 +03:00
sql_manager.cc
sql_manager.h
sql_map.cc
sql_map.h
sql_olap.cc
sql_parse.cc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 2006-06-28 14:23:33 +05:00
sql_prepare.cc Post-merge fixes. 2006-05-07 16:14:43 -07:00
sql_rename.cc Fix for bug #13525 "Rename table does not keep info of triggers". 2006-02-24 23:50:36 +03:00
sql_repl.cc foo2 2006-04-13 17:22:56 +09:30
sql_repl.h
sql_select.cc field.cc, field.h: 2006-06-21 01:14:53 +04:00
sql_select.h Merge rurik.mysql.com:/home/igor/mysql-4.1-opt 2006-06-02 17:06:10 -07:00
sql_show.cc bug #16832 (ALGORITHM missed in VIEW's information schema) 2006-06-13 17:23:43 +05:00
sql_sort.h
sql_state.c
sql_string.cc Merge mysql.com:/usr/home/bar/mysql-4.1.b15376 2006-03-23 12:41:28 +04:00
sql_string.h
sql_table.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-06-27 03:34:12 +04:00
sql_test.cc Post-review changes. 2006-05-03 21:35:27 -07:00
sql_trigger.cc A fix and a test case for 2006-06-27 00:47:52 +04: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 A fix and a test case for 2006-06-27 00:47:52 +04:00
sql_udf.h Bug#19904: UDF: not initialized *is_null per row 2006-06-08 13:25:28 -04:00
sql_union.cc Post merge fixes 2006-04-21 08:19:38 -07:00
sql_update.cc Addition to fix for 2006-06-19 17:50:52 +05:00
sql_view.cc A fix and a test case for 2006-06-27 00:47:52 +04:00
sql_view.h
sql_yacc.yy Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 2006-06-27 00:52:56 +04:00
stacktrace.c
stacktrace.h
strfunc.cc
structs.h Manually merged 2006-06-14 23:54:08 +04:00
table.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2006-06-26 04:48:16 +02:00
table.h Fix compilation failures on Windows caused by the patch for Bug#17199. 2006-06-27 14:56:24 +04:00
thr_malloc.cc
time.cc
tzfile.h
tztime.cc A fix and a test case for 2006-06-27 00:47:52 +04:00
tztime.h Fix for bug#11081 "Using a CONVERT_TZ function in a stored function or 2006-04-24 18:57:00 +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
unireg.cc
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
watchdog_mysqld