mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/sql
History
unknown 99cee82126 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg11394


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
mysql-test/r/sp-error.result:
  Manual merge.
mysql-test/t/sp-error.test:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.
2005-07-06 10:21:27 +04:00
..
examples Merge with 4.1 2005-06-07 00:31:53 +03:00
share Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-06 10:21:27 +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 manual merge 2005-07-04 03:50:04 +03:00
field.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +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 Fix bug #7422 "order by" doesn't work 2005-06-21 20:14:50 +04: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 fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
gstream.h
ha_berkeley.cc sql/mysql_priv.h 2005-06-09 15:48:57 +02: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 Simple optimization 2005-06-29 12:44:40 +03:00
ha_federated.h Fix broken linking when building with ha_federated 2005-06-05 23:00:45 +04:00
ha_heap.cc Bug#10178 - failure to find a row in heap table by concurrent UPDATEs 2005-06-24 19:47:18 +02:00
ha_heap.h Bug#10178 - failure to find a row in heap table by concurrent UPDATEs 2005-06-24 19:47:18 +02:00
ha_innodb.cc Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-07-04 16:12:08 +03:00
ha_innodb.h Merge hundin.mysql.fi:/home/marko/mysql-5.0 2005-06-21 07:36:18 +03:00
ha_myisam.cc fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
ha_myisam.h Merge neptunus.(none):/home/msvensson/mysql/bug10241 2005-05-09 11:26:48 +02:00
ha_myisammrg.cc fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02: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 manual merge 2005-07-04 03:50:04 +03:00
ha_ndbcluster.h Merged from mysql-4.1 to mysql-5.0 2005-06-22 14:10:02 +02:00
handler.cc Fixes during review of new code 2005-07-04 03:42:33 +03:00
handler.h Merged from mysql-4.1 to mysql-5.0 2005-06-22 14:10:02 +02: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 manual merge 2005-07-04 03:50:04 +03:00
item.h Fixes during review of new code 2005-07-04 03:42:33 +03:00
item_buff.cc Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-22 14:11:23 +05:00
item_cmpfunc.cc After merge fixes 2005-07-04 16:01:04 +03:00
item_cmpfunc.h After merge fixes 2005-07-04 16:01:04 +03: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 manual merge 2005-07-04 03:50:04 +03:00
item_func.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03: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 Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_row.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_strfunc.cc Merge with 4.1 2005-07-03 14:17:52 +03:00
item_strfunc.h Merge with 4.1 2005-07-03 14:17:52 +03:00
item_subselect.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_subselect.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_sum.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_sum.h merge 2005-07-05 11:21:47 +03:00
item_timefunc.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_timefunc.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
item_uniq.cc Merge with 4.1 2005-06-07 00:31:53 +03:00
item_uniq.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
key.cc Fixes while reviewing new code 2005-05-06 11:39:30 +03:00
lex.h Disabled the GOTO feature. (It's non-standard and undocumented.) 2005-07-01 15:25:51 +02:00
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 Merging 4.1 into 5.0 2005-07-05 16:02:03 +02:00
log_event.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
Makefile.am Merge 2005-06-20 22:31:25 +02: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 Fix for bug #10896 (0.00 > -0.00) 2005-06-08 21:56:22 +05:00
my_lock.c
mysql_priv.h After merge fixes 2005-07-04 03:24:25 +03:00
mysqld.cc manual merge 2005-07-04 03:50:04 +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 manual merge 2005-07-04 03:50:04 +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 fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
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 A fix and a test case for Bug#10794 "mysql_stmt_attr_set no 2005-06-30 16:17:10 +04:00
protocol.h A fix and a test case for Bug#10794 "mysql_stmt_attr_set no 2005-06-30 16:17:10 +04: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 mysql.com:/home/jimw/my/mysql-5.0-10214 2005-07-05 09:47:20 -07:00
set_var.h fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
slave.cc WL#2286 - Compile MySQL w/YASSL support 2005-06-22 14:08:28 +05:00
slave.h merge from 4.1 2005-03-24 14:32:40 +01:00
sp.cc do not register changes of stack variable 2005-07-03 00:51:02 +03: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-07-06 10:21:27 +04:00
sp_head.h fix bugs found by gcc 3.4 compiler 2005-07-01 13:27:23 +03: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 Fixed BUG#11529: crash server after use stored procedure 2005-06-30 18:07:06 +02:00
sp_rcontext.h Fixed BUG#11529: crash server after use stored procedure 2005-06-30 18:07:06 +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 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-07-05 15:23:13 -07:00
sql_acl.h added processing of view grants to table grants (BUG#9795) 2005-07-05 13:36:36 +03: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 After merge fixes 2005-07-04 03:24:25 +03:00
sql_bitmap.h merge 2005-06-05 17:19:50 +03:00
sql_cache.cc post-merge fixes 2005-07-05 12:23:13 +03:00
sql_cache.h
sql_class.cc Merge mysql.com:/home/jimw/my/mysql-5.0-10214 2005-07-05 09:47:20 -07:00
sql_class.h Fixes during review of new code 2005-07-04 03:42:33 +03: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 Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_derived.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_do.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_error.cc merge 2005-07-05 11:38:05 +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 Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_help.cc do not register changes of stack variable 2005-07-03 00:51:02 +03:00
sql_insert.cc After merge fixes 2005-07-04 03:24:25 +03:00
sql_lex.cc Merge 2005-07-05 13:42:19 +03:00
sql_lex.h Merge 2005-07-05 13:42:19 +03: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 Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_manager.cc
sql_manager.h
sql_map.cc WL#2286 - Compile MySQL w/YASSL support 2005-06-22 14:08:28 +05: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 Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_parse.cc manual merge 2005-07-04 03:50:04 +03:00
sql_prepare.cc After merge fixes 2005-07-04 03:24:25 +03:00
sql_rename.cc Bug#6877 MySQL should give an error if the requested table type is not available 2005-06-17 22:14:44 +01:00
sql_repl.cc Manual merge. 2005-06-07 14:50:45 +04:00
sql_repl.h WL#874 "Extended LOAD DATA". 2005-03-16 04:32:47 +03:00
sql_select.cc manual merge 2005-07-04 03:50:04 +03:00
sql_select.h A fix and a test case for Bug#11172 "mysql_stmt_attr_set 2005-07-01 15:47:45 +04:00
sql_show.cc Merge mysql.com:/home/jimw/my/mysql-5.0-6903 2005-07-05 17:05:31 -07: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 mysql.com:/home/jimw/my/mysql-4.1-clean 2005-07-05 15:23:13 -07:00
sql_test.cc Fixes while reviewing new code 2005-05-06 11:39:30 +03:00
sql_trigger.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03: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 Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_union.cc manual merge 2005-07-04 03:50:04 +03:00
sql_update.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_view.cc manual merge 2005-07-04 03:50:04 +03:00
sql_view.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_yacc.yy Merge with 4.1 2005-07-03 14:17:52 +03: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 Fix for bug#11055: information_schema: routines.sql_data_access has wrong value 2005-06-16 12:12:47 +05:00
table.cc Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
table.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +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 Bug#6877 MySQL should give an error if the requested table type is not available 2005-06-17 22:14:44 +01:00
unireg.h
watchdog_mysqld