mariadb/sql
unknown 06a948c36b Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg10015


sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-06-07 14:54:48 +04:00
..
examples Merge with 4.1 2005-06-07 00:31:53 +03:00
share Fix for bug #10015 "Crash in InnoDB if stored routines are used". 2005-06-07 14:53:08 +04:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc
des_key_file.cc default_modify.c: 2005-05-21 23:23:39 +02:00
discover.cc
field.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
field.h Cleanup's during review 2005-05-25 18:33:32 +03:00
field_conv.cc my_vsnprintf.c, sql_select.cc, sql_delete.cc, field_conv.cc, rt_split.c: 2005-05-20 15:17:13 +02:00
filesort.cc Moved some old test and added a new test to only be run with mysql-test-run --big 2005-04-07 19:24:14 +03:00
frm_crypt.cc
gen_lex_hash.cc a fix (#10742: Can't compile "sql_lex.cc" on AIX 5.2). 2005-05-19 18:56:01 +05:00
gstream.cc
gstream.h
ha_berkeley.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
ha_berkeley.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
ha_blackhole.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
ha_blackhole.h BUG#10241 cygwin port: invalid pragma interface directives 2005-05-04 15:05:56 +02:00
ha_federated.cc sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc: 2005-06-05 16:20:22 +02:00
ha_federated.h Fix broken linking when building with ha_federated 2005-06-05 23:00:45 +04:00
ha_heap.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
ha_heap.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
ha_innodb.cc ha_innodb.cc: 2005-06-07 11:51:27 +03:00
ha_innodb.h ha_innodb.h, ha_innodb.cc: 2005-05-17 21:43:15 +03:00
ha_myisam.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
ha_myisam.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
ha_myisammrg.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
ha_myisammrg.h Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE 2005-05-18 19:40:39 +02:00
ha_ndbcluster.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
ha_ndbcluster.h Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-18 14:34:42 +02:00
handler.cc Fix for bug #10015 "Crash in InnoDB if stored routines are used". 2005-06-07 14:53:08 +04:00
handler.h Resolve merge from 4.1 2005-05-18 13:54:36 -07:00
hash_filo.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
hash_filo.h forgotten s/__GNUC__/USE_PRAGMA_INTERFACE/ causes compilation faliures 2005-05-27 14:15:08 +02:00
hostname.cc Fixes during review 2005-05-13 14:04:32 +03:00
init.cc
item.cc After merge fixes 2005-06-07 05:43:59 +03:00
item.h merge 2005-06-05 17:19:50 +03:00
item_buff.cc
item_cmpfunc.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
item_cmpfunc.h item_func.h: 2005-06-02 07:27:02 -07:00
item_create.cc Merge mdk10.(none):/home/reggie/bk/mysql-4.1 2005-04-11 09:29:49 -05:00
item_create.h
item_func.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-07 14:54:48 +04:00
item_func.h item_func.h: 2005-06-02 10:00:32 -07:00
item_geofunc.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
item_geofunc.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
item_row.cc Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902) 2005-04-01 15:04:50 +03:00
item_row.h
item_strfunc.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
item_strfunc.h Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 2005-06-06 16:54:15 +05:00
item_subselect.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
item_subselect.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
item_sum.cc After merge fixes 2005-06-07 05:43:59 +03:00
item_sum.h Manual merge of fix for bug #9913 into 5.0 tree. 2005-05-09 16:21:57 +04:00
item_timefunc.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
item_timefunc.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
item_uniq.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
item_uniq.h Merge from 4.1 2005-05-26 21:01:55 +02:00
key.cc Fixes while reviewing new code 2005-05-06 11:39:30 +03:00
lex.h
lex_symbol.h
lock.cc merged 2005-06-03 18:29:36 +02:00
log.cc Moved tc_log_page_waits outside HAVE_MMAP, 2005-06-07 11:45:28 +03:00
log_event.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
log_event.h Merge from 4.1 2005-05-26 21:01:55 +02:00
Makefile.am Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902) 2005-04-01 15:04:50 +03:00
matherr.c
mf_iocache.cc
my_decimal.cc Trimmed fix for bug #9546 (Crashing with huge decimals) 2005-05-06 19:04:58 +05:00
my_decimal.h A lot of fixes to Precision math 2005-05-05 20:06:49 +05:00
my_lock.c
mysql_priv.h A fix for systems that don't have HAVE_MMAP defined. 2005-06-07 11:30:09 +03:00
mysqld.cc A fix for systems that don't have HAVE_MMAP defined. 2005-06-07 11:30:09 +03:00
mysqld_suffix.h
net_serv.cc Merge bk-internal.mysql.com:/users/rburnett/bug9721 2005-05-06 15:15:48 +02:00
nt_servc.cc
nt_servc.h
opt_range.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
opt_range.h Merge with 4.1 2005-06-07 00:31:53 +03:00
opt_sum.cc Fixed wrong key length when using MIN() optimization (non fatal, but caused InnoDB to write warnings to the log file) 2005-06-06 14:03:33 +03:00
parse_file.cc Code cleanups during code reviews 2005-06-01 16:35:09 +03:00
parse_file.h
password.c
procedure.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
procedure.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
protocol.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
protocol.h Fixed BUG#10961: Stored procedures: crash if select * from dual 2005-06-01 12:18:41 +02:00
protocol_cursor.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
records.cc Moved some old test and added a new test to only be run with mysql-test-run --big 2005-04-07 19:24:14 +03:00
repl_failsafe.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
repl_failsafe.h
set_var.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
set_var.h Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-18 14:50:57 +05:00
slave.cc Merge of 4.1->5.0. This contained the fixes for GCC 4.0 2005-06-01 21:56:30 -07:00
slave.h merge from 4.1 2005-03-24 14:32:40 +01:00
sp.cc Fixed BUG#9529: Stored Procedures: No Warning on truncation of procedure name 2005-05-31 18:36:32 +02:00
sp.h Fixed BUG#9529: Stored Procedures: No Warning on truncation of procedure name 2005-05-31 18:36:32 +02:00
sp_cache.cc sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc: 2005-06-05 16:20:22 +02:00
sp_cache.h Add USE_PRAGMA_INTERFACE and USE_PRAGMA_IMPLEMENTATION to files not existsing in 4.1 2005-05-27 12:03:37 +02:00
sp_head.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-06 14:36:21 +03:00
sp_head.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-27 14:38:34 +04:00
sp_pcontext.cc sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc: 2005-06-05 16:20:22 +02:00
sp_pcontext.h Add USE_PRAGMA_INTERFACE and USE_PRAGMA_IMPLEMENTATION to files not existsing in 4.1 2005-05-27 12:03:37 +02:00
sp_rcontext.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-06 14:36:21 +03:00
sp_rcontext.h Add USE_PRAGMA_INTERFACE and USE_PRAGMA_IMPLEMENTATION to files not existsing in 4.1 2005-05-27 12:03:37 +02:00
spatial.cc Merge mdk10.(none):/home/reggie/bk/mysql-4.1 2005-05-19 15:50:44 -05:00
spatial.h Fix warnings from icc 2005-05-18 19:00:21 +03:00
sql_acl.cc merged 2005-06-03 18:29:36 +02:00
sql_acl.h Bug#10246 - Parser: bad syntax for GRANT EXECUTE 2005-05-17 19:54:20 +01:00
sql_analyse.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_analyse.h Merge from 4.1 2005-05-26 21:01:55 +02:00
sql_base.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-07 14:54:48 +04:00
sql_bitmap.h merge 2005-06-05 17:19:50 +03:00
sql_cache.cc Clean up merge from 4.1 2005-05-02 10:19:37 -07:00
sql_cache.h
sql_class.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_class.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-07 14:54:48 +04:00
sql_client.cc
sql_crypt.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_crypt.h Add ifdefs to control when "#pragma implementation" should be used 2005-05-26 12:09:14 +02:00
sql_db.cc fixed conflicts 2005-05-20 16:34:59 -05:00
sql_delete.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-31 12:29:24 +03:00
sql_derived.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2005-04-01 13:02:29 +03:00
sql_do.cc
sql_error.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_error.h Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902) 2005-04-01 15:04:50 +03:00
sql_handler.cc merged 2005-06-03 18:29:36 +02:00
sql_help.cc Preparatory (and the most problematic) patch for Bug#7306 2005-05-30 20:54:37 +04:00
sql_insert.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_lex.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-30 20:56:11 +04:00
sql_lex.h Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-30 20:56:11 +04:00
sql_list.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_list.h merged 2005-05-19 15:20:10 +02:00
sql_load.cc Preparatory (and the most problematic) patch for Bug#7306 2005-05-30 20:54:37 +04:00
sql_manager.cc
sql_manager.h
sql_map.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_map.h Add ifdefs to control when "#pragma implementation" should be used 2005-05-26 12:09:14 +02:00
sql_olap.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_parse.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-07 14:54:48 +04:00
sql_prepare.cc Fixed failing tests for not 32 bit intel machines 2005-05-16 13:34:23 +03:00
sql_rename.cc Cleanup during reviews 2005-03-16 16:11:01 +02:00
sql_repl.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_repl.h WL#874 "Extended LOAD DATA". 2005-03-16 04:32:47 +03:00
sql_select.cc After merge fixes 2005-06-07 05:43:59 +03:00
sql_select.h A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute" 2005-05-12 11:16:12 +04:00
sql_show.cc Code cleanups during code reviews 2005-06-01 16:35:09 +03:00
sql_sort.h
sql_state.c
sql_string.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_string.h Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 2005-06-06 16:54:15 +05:00
sql_table.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_test.cc Fixes while reviewing new code 2005-05-06 11:39:30 +03:00
sql_trigger.cc Fix for bugs: 2005-05-24 22:19:33 +04:00
sql_trigger.h Fix for bug #10015 "Crash in InnoDB if stored routines are used". 2005-06-07 14:53:08 +04:00
sql_udf.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
sql_udf.h Manual merge of fix for bug #9913 into 5.0 tree. 2005-05-09 16:21:57 +04:00
sql_union.cc Give Item_arena::is_stmt_prepare a more descriptive name (it marks 2005-06-03 00:02:47 +04:00
sql_update.cc Code cleanups during code reviews 2005-06-01 16:35:09 +03:00
sql_view.cc Manual merge 2005-05-10 16:41:47 -07:00
sql_view.h
sql_yacc.yy Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-07 14:54:48 +04:00
stacktrace.c Step 2 of the switch to support configuration with NPTL: 2005-04-20 20:38:57 +02:00
stacktrace.h Step 2 of the switch to support configuration with NPTL: 2005-04-20 20:38:57 +02:00
strfunc.cc
structs.h Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-26 21:01:53 +02:00
table.cc Code cleanups during code reviews 2005-06-01 16:35:09 +03:00
table.h Code cleanups during code reviews 2005-06-01 16:35:09 +03:00
thr_malloc.cc
time.cc Don't use -lsupc++ with gcc 3.3 and below as this gives linking problems when linking staticly 2005-04-04 16:43:25 +03:00
tzfile.h
tztime.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
tztime.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
udf_example.cc
uniques.cc Code cleanups during code reviews 2005-06-01 16:35:09 +03:00
unireg.cc Some Windows compile improvements: 2005-06-06 15:23:04 +02:00
unireg.h
watchdog_mysqld