mariadb/sql
unknown e0f93ca8c1 Merge gleb.loc:/home/uchum/work/bk/5.0
into  gleb.loc:/home/uchum/work/bk/5.0-opt


sql/sql_class.h:
  Auto merged
2007-07-05 03:34:56 +05:00
..
examples Bug#28862 Extended Latin1 characters get lost in CVS engine 2007-06-15 11:19:35 +05:00
share BUG#26976 - Missing table in merge not noted in related error msg + 2007-06-06 04:42:41 +05:00
.cvsignore
add_errmsg
client_settings.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
CMakeLists.txt Bug#24732 Executables do not include Vista manifests 2007-05-15 10:30:11 -04:00
custom_conf.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
derror.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
des_key_file.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
discover.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
field.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 2007-06-15 08:56:40 -06:00
field.h Merge bk@192.168.21.1:mysql-5.0 2007-06-14 16:41:10 +05:00
field_conv.cc Merge olga.mysql.com:/home/igor/mysql-4.1-opt 2007-06-30 16:24:09 -07:00
filesort.cc Fixed bug #25798. 2007-07-01 15:33:28 -07:00
frm_crypt.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
gen_lex_hash.cc gen_lex_hash.cc: 2007-01-31 00:06:42 +01:00
gstream.cc
gstream.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
ha_archive.cc BUG#26138 - REPAIR TABLE with option USE_FRM erases all records in 2007-03-30 13:00:21 +05:00
ha_archive.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
ha_berkeley.cc Fixed compiler warnings. 2007-02-28 22:23:35 +02:00
ha_berkeley.h Fixed compiler warnings (for linux and win32 and win64) 2007-02-22 16:59:57 +02:00
ha_blackhole.cc Bug#19717: The blackhole engine is returning an OK flag in 2007-02-14 18:35:59 +02:00
ha_blackhole.h Merge mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-4.1-engines 2007-05-10 18:14:04 +05:00
ha_federated.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
ha_federated.h
ha_heap.cc Merge chilla.local:/home/mydev/mysql-4.1-bug24985 2007-03-27 10:54:37 +02:00
ha_heap.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
ha_innodb.cc Merge bk@192.168.21.1:mysql-5.0 2007-04-29 18:42:50 +05:00
ha_innodb.h Apply innodb-5.0-ss1405 snapshot 2007-04-18 19:36:22 -06:00
ha_myisam.cc BUG#26976 - Missing table in merge not noted in related error msg + 2007-06-06 04:42:41 +05:00
ha_myisam.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
ha_myisammrg.cc BUG#26976 - Missing table in merge not noted in related error msg + 2007-06-14 16:18:01 +05:00
ha_myisammrg.h BUG#26976 - Missing table in merge not noted in related error msg + 2007-06-06 04:42:41 +05:00
ha_ndbcluster.cc Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 2007-05-28 15:23:28 +02:00
ha_ndbcluster.h Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj 2007-05-08 10:00:12 +08:00
ha_ndbcluster_cond.cc Back-ported compiler warning fixes from 5.1 to ease merging 2007-04-24 10:25:15 +02:00
ha_ndbcluster_cond.h Changed void* to const NdbDictionary::Table* 2007-04-23 12:12:44 +02:00
handler.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 2007-06-20 12:46:15 +04:00
handler.h Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 2007-06-17 19:52:01 +02:00
hash_filo.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
hash_filo.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
hostname.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
init.cc Fix for bug #28121 "INSERT or UPDATE into DOUBLE(200,0) field being truncated to 31 digits" 2007-05-28 12:44:59 +04:00
item.cc Fixed bug #29205. 2007-06-30 02:09:50 +05:00
item.h Fix for BUG#10491: Server returns data as charset binary 2007-06-28 13:24:52 +04:00
item_buff.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
item_cmpfunc.cc Merge bk@192.168.21.1:mysql-5.0 2007-06-14 16:41:10 +05:00
item_cmpfunc.h Bug#28133: Wrong DATE/DATETIME comparison in IN() function. 2007-05-07 22:20:43 +04:00
item_create.cc Bug #28897 UUID() returns non-unique values when query cache is enabled 2007-06-13 14:23:25 -04:00
item_create.h Bug #27921 View ignores precision for CAST() 2007-05-10 00:17:21 +05:00
item_func.cc Merge gleb.loc:/home/uchum/work/bk/5.0-opt 2007-06-16 13:49:26 +05:00
item_func.h user_var.result: 2007-06-03 15:56:48 +04:00
item_geofunc.cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 2007-03-05 18:22:35 +04:00
item_geofunc.h Merge mysql.com:/home/ram/work/b26038/b26038.4.1 2007-02-28 12:13:46 +04:00
item_row.cc
item_row.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
item_strfunc.cc Fixed bug #27130. If the third argument of the function SUBSTR was 2007-06-17 11:23:19 -07:00
item_strfunc.h Bug #27530: 2007-04-11 13:58:16 +03:00
item_subselect.cc Bug#27333: subquery grouped for aggregate of outer 2007-06-29 10:39:17 +03:00
item_subselect.h Fixed bug #27870. The bug that causes crashes manifests itself at some 2007-04-17 17:35:29 -07:00
item_sum.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 2007-07-02 13:22:23 +02:00
item_sum.h Bug#27333: subquery grouped for aggregate of outer 2007-06-29 10:39:17 +03:00
item_timefunc.cc Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base 2007-06-11 11:32:10 -06:00
item_timefunc.h Backport of TIME->MYSQL_TIME / Y2K fixset 2007-05-16 10:44:59 +02:00
item_uniq.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
item_uniq.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
key.cc Patch to eliminate compilation errors under VC after bug #13191 fix. 2007-04-29 12:56:46 +05:00
lex.h Fix -ansi -pedantic warning (can't cast a pointer to function 2007-03-08 12:04:45 +03:00
lex_symbol.h Fix -ansi -pedantic warning (can't cast a pointer to function 2007-03-08 12:04:45 +03:00
lock.cc Merge mysql.com:/home/svoj/devel/mysql/BUG28574/mysql-4.1-engines 2007-06-01 13:54:31 +05:00
log.cc Bug #28983: 'reset master' in multiple threads and innodb tables 2007-07-03 10:36:37 +03:00
log_event.cc Merge gleb.loc:/home/uchum/work/bk/5.0 2007-06-24 12:58:45 +05:00
log_event.h Bug#22725 Replication outages from ER_SERVER_SHUTDOWN (1053) set in replication events 2007-05-28 22:20:22 +03:00
Makefile.am Merge mysql.com:/home/kent/bk/tmp3/mysql-4.1-build 2007-05-30 22:15:13 +02:00
matherr.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
message.mc
mf_iocache.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
my_decimal.cc Backport of TIME->MYSQL_TIME / Y2K fixset 2007-05-16 10:44:59 +02:00
my_decimal.h Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 2007-05-28 00:05:38 +02:00
my_lock.c my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mysql_priv.h Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 2007-06-05 17:28:49 +02:00
mysqld.cc Bug#24924: shared-memory-base-name that is too long causes buffer overflow 2007-06-21 04:30:10 +02:00
mysqld_suffix.h
net_serv.cc Merge mysql.com:/home/hf/work/29117/my41-29117 2007-06-19 12:31:37 +05:00
nt_servc.cc
nt_servc.h
opt_range.cc BUG#26624, pushbuild fixes: Merge to 5.0 2007-03-31 00:48:31 +04:00
opt_range.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
opt_sum.cc Bug#27573: MIN() on an indexed column which is always NULL sets _other_ results 2007-05-15 15:29:12 +03:00
parse_file.cc Polishing: add comments. 2007-04-06 18:56:39 +04:00
parse_file.h
password.c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
procedure.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
procedure.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
protocol.cc Backport of TIME->MYSQL_TIME / Y2K fixset 2007-05-16 10:44:59 +02:00
protocol.h Backport of TIME->MYSQL_TIME / Y2K fixset 2007-05-16 10:44:59 +02:00
records.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
repl_failsafe.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-02-21 14:07:08 +02:00
repl_failsafe.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
set_var.cc Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 2007-06-05 23:04:40 +02:00
set_var.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-02-21 14:07:08 +02:00
slave.cc Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 2007-04-24 09:25:54 -06:00
slave.h Fix for BUG#24432 2007-02-08 15:53:14 +01:00
sp.cc Fix typo in the patch for BUG#25411 on 24-Apr-2007. 2007-06-19 01:54:35 +04:00
sp.h
sp_cache.cc
sp_cache.h
sp_head.cc Fix typo in the patch for BUG#25411 on 24-Apr-2007. 2007-06-19 01:54:35 +04:00
sp_head.h Bug#26977 exception handlers never hreturn 2007-05-07 10:23:10 +02:00
sp_pcontext.cc Bug#26503 (Illegal SQL exception handler code causes the server to crash) 2007-03-14 12:02:32 -06:00
sp_pcontext.h Bug#26503 (Illegal SQL exception handler code causes the server to crash) 2007-03-14 12:02:32 -06:00
sp_rcontext.cc
sp_rcontext.h
spatial.cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 2007-03-05 18:22:35 +04:00
spatial.h Bug #24563: MBROverlaps does not seem to function propertly. 2007-03-23 16:28:07 -06:00
sql_acl.cc BUG#29030 (DROP USER command that errors still gets written to binary log 2007-06-20 14:24:31 +02:00
sql_acl.h Bug#20166 mysql-test-run.pl does not test system privilege tables creation 2007-03-16 20:56:16 +01:00
sql_analyse.cc Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 2007-02-06 17:18:43 +04:00
sql_analyse.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_array.h
sql_base.cc Merge bk-internal:/home/bk/mysql-5.0-opt 2007-06-03 10:03:37 +03:00
sql_bitmap.h
sql_cache.cc Corrected merge error; missing line in debug statement. 2007-05-10 14:54:55 +02:00
sql_cache.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
sql_class.cc Merge gleb.loc:/home/uchum/work/bk/4.1-opt 2007-07-04 02:09:56 +05:00
sql_class.h Merge gleb.loc:/home/uchum/work/bk/5.0 2007-07-05 03:34:56 +05:00
sql_client.cc Bug#26664 test suite times out on OS X 64bit 2007-05-24 11:21:27 +02:00
sql_crypt.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_crypt.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_cursor.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_cursor.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_db.cc Fix for BUG#27337: Privileges are not properly restored. 2007-04-03 15:11:34 +04:00
sql_delete.cc Merge debian.(none):/M50/mysql-5.0 2007-04-20 12:31:03 +02:00
sql_derived.cc - renaming TMP_TABLE to NON_TRANSACTIONAL_TMP_TABLE because this is 2007-03-22 15:07:32 +01:00
sql_do.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_error.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 2007-06-20 12:46:15 +04:00
sql_error.h BUG#26976 - Missing table in merge not noted in related error msg + 2007-06-06 04:42:41 +05:00
sql_handler.cc Fix for: 2007-05-11 20:33:13 +04:00
sql_help.cc Bug #25831: Deficiencies in INSERT ... SELECT ... field name resolving. 2007-02-19 14:39:37 +02:00
sql_insert.cc Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 2007-06-27 14:02:32 +02:00
sql_lex.cc Code review comments 2007-05-25 16:17:20 -06:00
sql_lex.h Bug#27876 (SF with cyrillic variable name fails during execution (regression)) 2007-05-25 14:36:01 -06:00
sql_list.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_list.h Merge of BUG#26624 and BUG#26625 2007-03-29 10:35:28 +04:00
sql_load.cc Merge gleb.loc:/home/uchum/work/bk/4.1-opt 2007-07-04 02:09:56 +05:00
sql_locale.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 2007-01-12 12:22:54 +01:00
sql_manager.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_manager.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_map.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_map.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_olap.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_parse.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-07-02 02:01:05 +04:00
sql_prepare.cc Merge adventure.(none):/home/thek/Development/cpp/bug28846/my50-bug28846 2007-06-22 15:40:35 +02:00
sql_rename.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_repl.cc Bug#26664 test suite times out on OS X 64bit 2007-05-24 11:21:27 +02:00
sql_repl.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_select.cc Bug#27333: subquery grouped for aggregate of outer 2007-06-29 10:39:17 +03:00
sql_select.h Bug#27333: subquery grouped for aggregate of outer 2007-06-29 10:39:17 +03:00
sql_show.cc Backport from 5.2: Fix valgrind failure: Don't access item_func->arguments() 2007-07-04 17:11:56 +04:00
sql_sort.h Fixed bug #25798. 2007-07-01 15:33:28 -07:00
sql_state.c
sql_string.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
sql_string.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2007-01-22 14:04:40 +02:00
sql_table.cc Merge chilla.local:/home/mydev/mysql-5.0-amain 2007-06-15 17:47:02 +02:00
sql_test.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_trigger.cc Fix typo in the patch for BUG#25411 on 24-Apr-2007. 2007-06-19 01:54:35 +04:00
sql_trigger.h Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 2007-04-05 08:39:12 +02:00
sql_udf.cc Merge bk-internal:/home/bk/mysql-5.0-opt 2007-01-03 18:29:39 +02:00
sql_udf.h my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
sql_union.cc Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug27937 2007-05-14 17:06:05 -07:00
sql_update.cc Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl 2007-06-05 01:14:10 +02:00
sql_view.cc Merge adventure.(none):/home/thek/Development/cpp/bug28846/my50-bug28846 2007-06-22 15:40:35 +02:00
sql_view.h
sql_yacc.yy Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 2007-07-02 17:02:01 +02:00
stacktrace.c
stacktrace.h
strfunc.cc Fixed compiler warnings. 2007-03-22 20:32:07 +02:00
structs.h Bug#28149 overflow in some "SHOW STATUS"-variables 2007-06-09 17:46:09 +05:00
table.cc Bug #26642: create index corrupts table definition in .frm 2007-06-27 14:35:49 +03:00
table.h Fixed bug #27827. 2007-06-01 02:15:40 +05:00
thr_malloc.cc my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
time.cc Backport of TIME->MYSQL_TIME / Y2K fixset 2007-05-16 10:44:59 +02:00
tzfile.h
tztime.cc Backport of TIME->MYSQL_TIME / Y2K fixset 2007-05-16 10:44:59 +02:00
tztime.h Backport of TIME->MYSQL_TIME / Y2K fixset 2007-05-16 10:44:59 +02:00
udf_example.c bug#27741: udf test fails on AIX < 5.3 2007-05-31 14:22:21 +02:00
udf_example.def Fixed compiler warnings (for linux and win32 and win64) 2007-02-22 16:59:57 +02:00
uniques.cc Fixed bug #25798. 2007-07-01 15:33:28 -07:00
unireg.cc Backport of TIME->MYSQL_TIME / Y2K fixset 2007-05-16 10:44:59 +02:00
unireg.h Fix for BUG#27592: stack overrun when storing datetime value 2007-06-07 13:50:22 +04:00
watchdog_mysqld