mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/myisam
History
unknown 73c9909750 Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
configure.in:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ps_2myisam.result:
  Auto merged
mysql-test/r/ps_3innodb.result:
  Auto merged
mysql-test/r/ps_4heap.result:
  Auto merged
mysql-test/r/ps_5merge.result:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/drop.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
ndb/include/ndb_global.h.in:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/time.cc:
  Auto merged
innobase/row/row0upd.c:
  Trivial merge
mysql-test/t/func_concat.test:
  Keep local code
mysql-test/t/multi_update.test:
  auto merge
sql/ha_ndbcluster.cc:
  manual merge
sql/item_timefunc.cc:
  manual merge
sql/mysql_priv.h:
  manual merge
sql/sql_class.h:
  manual merge
sql/sql_delete.cc:
  manual merge
sql/sql_insert.cc:
  manual merge
sql/sql_lex.cc:
  manual merge
sql/sql_lex.h:
  manual merge
sql/sql_load.cc:
  manual merge
sql/sql_parse.cc:
  manual merge
sql/sql_table.cc:
  manual merge
sql/sql_update.cc:
  manual merge
2005-01-03 23:04:52 +02:00
..
ftbench ftbench fixes 2003-10-23 23:33:06 +02:00
.cvsignore This ChangeSet adds RTREE support into myisam library. 2002-02-20 14:11:21 +04:00
ChangeLog New thr_alarm struct for better integration with OS2 2000-11-28 04:47:47 +02:00
ft_boolean_search.c After merge fixes 2004-12-31 00:44:00 +02:00
ft_eval.c Big code cleanup/review before 4.0.2 release. 2002-06-11 11:20:31 +03:00
ft_eval.h MI_KEYSEG -> HA_KEYSEG 2002-04-25 15:10:29 +05:00
ft_nlq_search.c Fix compiler warnings (detected by Intel's C++ compiler) 2004-10-22 18:44:51 +03:00
ft_parser.c don't hang if the text contains illegal characters 2004-10-25 10:23:38 +02:00
ft_static.c After merge fixes 2004-12-31 03:47:56 +02:00
ft_stem.c Update copyright 2001-12-06 14:10:51 +02:00
ft_stopwords.c BTREE-indexes in HEAP tables can now be used to optimize ORDER BY 2004-03-25 15:05:01 +02:00
ft_test1.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
ft_test1.h Update copyright 2001-12-06 14:10:51 +02:00
ft_update.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
ftdefs.h bug in my_strnncoll_utf8 (and friends) fixed 2004-08-30 08:37:36 +02:00
fulltext.h ft1->ft2 auto-conversion on INSERT (WL#725) 2003-10-02 20:22:29 +02:00
make-ccc Import changeset 2000-07-31 21:29:14 +02:00
Makefile.am after merge fix 2004-08-20 22:54:42 +02:00
mi_cache.c enadling out-of-cache reads for shared IO_CACHE 2003-01-26 14:20:43 +01:00
mi_changed.c Update copyright 2001-12-06 14:10:51 +02:00
mi_check.c Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY 2005-01-03 23:04:52 +02:00
mi_checksum.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_close.c Merge with 4.0 for 4.1 release 2004-10-06 19:14:33 +03:00
mi_create.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_dbug.c Merge with global tree 2004-12-19 20:25:19 +02:00
mi_delete.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_delete_all.c Merge key cache structures to one 2003-11-20 22:06:25 +02:00
mi_delete_table.c Code cleanup 2004-01-19 23:51:17 +01:00
mi_dynrec.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_extra.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_info.c WL#1895 - Print message to error log in case of detected MyISAM corruption 2004-12-23 20:11:38 +01:00
mi_key.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_keycache.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_locking.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_log.c Code cleanup 2004-01-19 23:51:17 +01:00
mi_open.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_packrec.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_page.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_panic.c Merge key cache structures to one 2003-11-20 22:06:25 +02:00
mi_preload.c Added missing SSL library (Should be in source distribution) 2003-11-28 12:18:13 +02:00
mi_range.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_rename.c Code cleanup 2004-01-19 23:51:17 +01:00
mi_rfirst.c Update copyright 2001-12-06 14:10:51 +02:00
mi_rkey.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_rlast.c Update copyright 2001-12-06 14:10:51 +02:00
mi_rnext.c Merging 2004-05-27 16:32:49 +05:00
mi_rnext_same.c Merge with 4.1 2004-12-22 13:54:39 +02:00
mi_rprev.c Fixed many compiler warnings 2004-04-05 13:56:05 +03:00
mi_rrnd.c just tried to find all 'skipp' and replace it with 'skip'. 2004-02-02 20:25:39 +04:00
mi_rsame.c Update copyright 2001-12-06 14:10:51 +02:00
mi_rsamepos.c Update copyright 2001-12-06 14:10:51 +02:00
mi_scan.c Update copyright 2001-12-06 14:10:51 +02:00
mi_search.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_static.c handler interface cleanups: 2004-06-23 12:29:05 +02:00
mi_statrec.c just tried to find all 'skipp' and replace it with 'skip'. 2004-02-02 20:25:39 +04:00
mi_test1.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_test2.c Support for character set conversion in binary protocol: another go 2004-05-25 02:03:49 +04:00
mi_test3.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_test_all.res Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_test_all.sh Add detection of in_addr_t 2003-08-28 06:08:17 +03:00
mi_unique.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
mi_update.c After merge fixes 2004-12-31 03:47:56 +02:00
mi_write.c After merge fixes 2004-12-31 03:47:56 +02:00
myisam_ftdump.c Review of all code pushed since last review 2004-10-20 01:28:42 +03:00
myisamchk.c Add support for up to VARCHAR (size up to 65535) 2004-12-06 02:00:37 +02:00
myisamdef.h After merge fixes 2004-12-31 03:47:56 +02:00
myisamlog.c Fix skipp -> skip once and for all. 2004-06-03 11:52:54 -05:00
myisampack.c Add 0x before pointers (to help with debugging) 2004-12-18 05:19:21 +02:00
NEWS Import changeset 2000-07-31 21:29:14 +02:00
rt_index.c Fix for bug #6516 (Server crash loading spatial data) 2004-12-10 16:06:49 +04:00
rt_index.h Merging 2004-06-02 19:17:35 +05:00
rt_key.c Merging 2004-06-02 19:17:35 +05:00
rt_key.h Merging 2004-06-02 19:17:35 +05:00
rt_mbr.c Fix compiler warnings (detected by Intel's C++ compiler) 2004-10-22 18:44:51 +03:00
rt_mbr.h Merging 2004-06-02 19:17:35 +05:00
rt_split.c Merging 2004-06-02 19:17:35 +05:00
rt_test.c Review of all code pushed since last review 2004-10-20 01:28:42 +03:00
sort.c Merge with 4.1 2004-12-22 13:54:39 +02:00
sp_defs.h WL#1163 To make spatial code optional 2004-03-12 18:51:03 +04:00
sp_key.c Fix for bug #6516 (Server crash loading spatial data) 2004-12-10 16:06:49 +04:00
sp_test.c Merging 2004-05-27 16:32:49 +05:00
test_pack Import changeset 2000-07-31 21:29:14 +02:00
TODO Import changeset 2000-07-31 21:29:14 +02:00