mariadb/sql
unknown f6c1d4191c Merge
Makefile.am:
  Auto merged
BitKeeper/etc/config:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/innobase/include/page0page.ic:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_static.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/include/kernel/signaldata/SignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartFragReq.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/StartRec.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
sql/log_event.cc:
  SCCS merged
sql/sql_prepare.cc:
  SCCS merged
sql/share/errmsg.txt:
  merge
2005-09-06 09:20:15 +02:00
..
examples Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2005-09-02 08:59:59 +02:00
share Merge 2005-09-06 09:20:15 +02:00
.cvsignore
add_errmsg
client_settings.h
custom_conf.h
derror.cc Remove compiler warnings and remove not used variables 2005-02-25 16:53:22 +02:00
des_key_file.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-07-19 11:05:49 -07:00
discover.cc
field.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
field.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
field_conv.cc Fix bug #11398 Bug in field_conv() results in wrong result of join with index 2005-08-16 22:13:43 +04: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 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
ha_berkeley.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
ha_blackhole.cc ha_blackhole.cc: 2005-08-30 02:46:03 +02:00
ha_blackhole.h Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 2005-08-26 15:56:52 +03:00
ha_federated.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
ha_federated.h Merge 2005-09-06 09:20:15 +02:00
ha_heap.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_heap.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
ha_innodb.cc Merge 2005-09-06 09:20:15 +02:00
ha_innodb.h merge 2005-08-31 20:45:48 +02:00
ha_myisam.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_myisam.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_myisammrg.cc Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_myisammrg.h Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 2005-07-23 00:15:53 +03:00
ha_ndbcluster.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2005-09-02 08:59:59 +02:00
ha_ndbcluster.h generalized option for specifying ndb distribution 2005-08-22 11:41:37 +02:00
ha_partition.cc WL #2602, #2603, #2604 2005-08-19 10:26:05 -04:00
ha_partition.h WL #2602, #2603, #2604 2005-08-19 10:26:05 -04:00
handler.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
handler.h merge 2005-08-31 20:45:48 +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 Fix shortcircuit of 127.0.0.1 -> localhost lookup on little-endian machines. (Bug #11822) 2005-07-27 13:01:48 +02:00
init.cc Fixes during review of new pushed code 2005-08-12 13:54:42 +03:00
item.cc Merge 2005-09-06 09:20:15 +02:00
item.h Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 2005-08-29 15:44:49 +05:00
item_buff.cc sql_select.cc: 2005-07-25 12:57:23 -07:00
item_cmpfunc.cc Rename: 2005-09-02 17:21:19 +04:00
item_cmpfunc.h Fix bug #12489 wrongly printed strcmp() function results in creation of broken 2005-08-31 00:54:41 +04:00
item_create.cc Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 2005-08-25 17:34:34 +04:00
item_create.h Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 2005-08-25 17:34:34 +04:00
item_func.cc Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures". 2005-09-03 03:13:18 +04:00
item_func.h func_str.result, null.result: 2005-08-26 22:25:45 -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 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 mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-31 15:24:06 -07:00
item_strfunc.h Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2005-07-16 00:17:05 +03:00
item_subselect.cc Merge 2005-09-06 09:20:15 +02:00
item_subselect.h Rename: 2005-09-02 17:21:19 +04:00
item_sum.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-31 15:24:06 -07:00
item_sum.h Rename: 2005-09-02 17:21:19 +04:00
item_timefunc.cc Make SYSDATE() behave as in Oracle: always the current datetime, not the 2005-08-24 15:50:58 -07:00
item_timefunc.h Make SYSDATE() behave as in Oracle: always the current datetime, not the 2005-08-24 15:50:58 -07: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 Bug #12116 patch 2005-07-22 17:05:16 -04:00
lex.h merge 2005-08-31 20:45:48 +02:00
lex_symbol.h
lock.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
log.cc merge 2005-08-31 20:45:48 +02:00
log_event.cc Merge 2005-09-06 09:20:15 +02:00
log_event.h Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures". 2005-09-03 03:13:18 +04:00
Makefile.am merge 2005-08-31 20:45:48 +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 Merge 2005-09-06 09:20:15 +02:00
mysqld.cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2005-09-02 08:59:59 +02:00
mysqld_suffix.h
net_serv.cc Merge mysql.com:/home/bkroot/mysql-4.1 2005-07-13 02:13:04 +02:00
nt_servc.cc
nt_servc.h cleaned up mysql installation code for windows. 2005-02-09 22:02:48 +02:00
opt_range.cc merge 2005-08-31 20:45:48 +02:00
opt_range.h Merge with 4.1 2005-06-07 00:31:53 +03:00
opt_sum.cc Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
parse_file.cc store/restore sql_mode which was in force during ctrigger creation (BUG#5891) 2005-07-28 22:39:11 +03:00
parse_file.h store/restore sql_mode which was in force during ctrigger creation (BUG#5891) 2005-07-28 22:39:11 +03:00
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 fix for bug#8692 2005-07-22 08:11:23 +02:00
records.cc Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
repl_failsafe.cc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-02 10:44:48 +02:00
repl_failsafe.h
rpl_filter.cc WL#2472: 2005-03-21 22:09:42 +01:00
rpl_filter.h WL#2472: Fixes according to review 2005-03-22 10:19:24 +01:00
set_var.cc Merge 2005-09-06 09:20:15 +02:00
set_var.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
slave.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
slave.h updates for BUG#10780 - fixed slave I/O thread running status to No while attempting 2005-07-29 21:00:28 -06:00
sp.cc Merge 2005-09-06 09:20:15 +02:00
sp.h Avoid spurious error when restoring INFORMATION_SCHEMA as the current 2005-08-11 17:04:16 -07:00
sp_cache.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-11 16:43:22 +03:00
sp_cache.h BUG#12228: Post review fixes: Added test case, code cleanup. 2005-08-10 21:17:02 +00:00
sp_head.cc Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures". 2005-09-03 03:13:18 +04:00
sp_head.h Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures". 2005-09-03 03:13:18 +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 Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 2005-08-25 17:34:34 +04:00
sp_rcontext.cc Fix for Bug#11247 Stored procedures: Function calls in long loops leak memory 2005-08-18 11:23:54 +02:00
sp_rcontext.h Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 2005-08-25 17:34:34 +04: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 Commit the last part of the manual merge 2005-09-02 13:44:55 +02:00
sql_acl.h Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 2005-09-02 08:59:59 +02: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_array.h Fix for BUG#12335 (SP replication) : New binlogging strategy for stored PROCEDUREs/FUNCTIONs. 2005-08-25 17:34:34 +04:00
sql_base.cc Merge 2005-09-06 09:20:15 +02:00
sql_bitmap.h merge 2005-07-20 00:40:49 +02:00
sql_cache.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
sql_cache.h merge 2005-02-07 21:39:37 +02:00
sql_class.cc Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures". 2005-09-03 03:13:18 +04:00
sql_class.h Merge 2005-09-06 09:20:15 +02: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 after merge fix 2005-08-26 15:28:08 +04:00
sql_delete.cc Merge 2005-09-06 09:20:15 +02:00
sql_derived.cc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-15 18:35:48 +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 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
sql_help.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
sql_insert.cc Merge 2005-09-06 09:20:15 +02:00
sql_lex.cc Merge 2005-09-06 09:20:15 +02:00
sql_lex.h Merge 2005-09-06 09:20:15 +02:00
sql_list.cc a compiler must see '#pragma implementation' *before* 2005-06-05 19:38:52 +02:00
sql_list.h Add a comment about I_List<> copy constructor. 2005-08-22 19:23:01 +04:00
sql_load.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04: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 Implementation of WL#2486 - 2005-08-12 17:57:19 +03:00
sql_parse.cc Merge 2005-09-06 09:20:15 +02:00
sql_partition.cc Test to see if my commit emails go through 2005-08-26 21:11:56 -04:00
sql_prepare.cc Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures". 2005-09-03 03:13:18 +04: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 merge 2005-07-19 21:56:10 +02:00
sql_repl.h WL#2472: Fixes according to review 2005-03-22 10:19:24 +01:00
sql_select.cc Merge 2005-09-06 09:20:15 +02:00
sql_select.h Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-25 13:11:38 -04:00
sql_show.cc Merge 2005-09-06 09:20:15 +02: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 neptunus.(none):/home/msvensson/mysql/mysql-5.0 2005-09-02 08:59:59 +02:00
sql_test.cc Merge mysql.com:/home/jimw/my/mysql-4.1-clean 2005-08-15 12:37:45 -07:00
sql_trigger.cc Save and clear run context before executing a stored function or trigger and restore it afterwards. 2005-08-15 18:15:12 +03:00
sql_trigger.h Save and clear run context before executing a stored function or trigger and restore it afterwards. 2005-08-15 18:15:12 +03:00
sql_udf.cc - backport of a compile fix from 4.1 (ChangeSet@1.2260.23.2 2005/05/19 from reggie) 2005-06-30 17:33:23 +02:00
sql_udf.h Name resolution context added (BUG#6443) 2005-07-01 07:05:42 +03:00
sql_union.cc Rename: 2005-09-02 17:21:19 +04:00
sql_update.cc Merge 2005-09-06 09:20:15 +02:00
sql_view.cc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 2005-09-02 17:06:15 +03:00
sql_view.h Fix bug #11864 non unique names are allowed in subquery 2005-08-10 17:45:00 +04:00
sql_yacc.yy Merge 2005-09-06 09:20:15 +02: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 Remove compiler warnings and remove not used variables 2005-02-25 16:53:22 +02:00
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 Merge 2005-09-06 09:20:15 +02:00
table.h Merge 2005-09-06 09:20:15 +02:00
thr_malloc.cc
time.cc Fixes during review of new pushed code 2005-07-31 12:49:55 +03:00
tzfile.h
tztime.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
tztime.h Fixes during review of new pushed code 2005-07-31 12:49:55 +03:00
udf_example.cc
uniques.cc Code cleanups during code reviews 2005-06-01 16:35:09 +03:00
unireg.cc Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-08-05 18:01:34 -04:00
unireg.h merge 2005-08-31 20:45:48 +02:00
watchdog_mysqld