mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/myisam
History
unknown 4ad51359c1 Merge with 4.1 
(Includes merge of arena code in 4.1 and 5.0)



BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
libmysql/client_settings.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
libmysqld/examples/Makefile.am:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/ctype_recoding.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_in.result:
  Auto merged
mysql-test/r/func_like.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/ndb_autodiscover.result:
  Auto merged
mysql-test/r/null.result:
  Auto merged
mysql-test/r/olap.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/ps_1general.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/range.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/null.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/rpl_charset.test:
  Auto merged
mysql-test/t/rpl_heap.test:
  Auto merged
mysql-test/t/rpl_relayrotate.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_create.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.h:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/client.c:
  Auto merged
client/mysqlbinlog.cc:
  Merge with 4.1
configure.in:
  Merge with 4.1
include/mysqld_error.h:
  Add new error message (1) from 4.1
mysql-test/mysql-test-run.sh:
  Merge with 4.1
mysql-test/r/func_gconcat.result:
  Merge with 4.1
mysql-test/r/func_if.result:
  Merge with 4.1
mysql-test/r/grant.result:
  Merge with 4.1
mysql-test/r/join_outer.result:
  Merge with 4.1
mysql-test/r/rpl_charset.result:
  Merge with 4.1 (This has to be fixed before pushing)
mysql-test/r/system_mysql_db.result:
  Merge with 4.1.
  Added collation to new privileges
mysql-test/t/grant.test:
  Merge with 4.1
mysql-test/t/grant_cache.test:
  Merge with 4.1
mysql-test/t/show_check.test:
  Merge with 4.1
sql/Makefile.am:
  Merge with 4.1
sql/item.cc:
  Merge with 4.1
sql/item_cmpfunc.cc:
  Merge with 4.1 (arena code)
sql/item_subselect.cc:
  Merge with 4.1
sql/item_subselect.h:
  Merge with 4.1
sql/item_sum.cc:
  Merge with 4.1
sql/item_sum.h:
  Merge with 4.1
sql/log.cc:
  Merge with 4.1 (Remove code that is not relevant for 5.0)
sql/mysqld.cc:
  Merge with 4.1
sql/opt_range.cc:
  Merge with 4.1
sql/share/czech/errmsg.txt:
  Merge with 4.1
sql/share/danish/errmsg.txt:
  Merge with 4.1
sql/share/dutch/errmsg.txt:
  Merge with 4.1
sql/share/english/errmsg.txt:
  Merge with 4.1
sql/share/estonian/errmsg.txt:
  Merge with 4.1
sql/share/french/errmsg.txt:
  Merge with 4.1
sql/share/german/errmsg.txt:
  Merge with 4.1
sql/share/greek/errmsg.txt:
  Merge with 4.1
sql/share/hungarian/errmsg.txt:
  Merge with 4.1
sql/share/italian/errmsg.txt:
  Merge with 4.1
sql/share/japanese/errmsg.txt:
  Merge with 4.1
sql/share/korean/errmsg.txt:
  Merge with 4.1
sql/share/norwegian-ny/errmsg.txt:
  Merge with 4.1
sql/share/norwegian/errmsg.txt:
  Merge with 4.1
sql/share/polish/errmsg.txt:
  Merge with 4.1
sql/share/portuguese/errmsg.txt:
  Merge with 4.1
sql/share/romanian/errmsg.txt:
  Merge with 4.1
sql/share/russian/errmsg.txt:
  Merge with 4.1
sql/share/serbian/errmsg.txt:
  Merge with 4.1
sql/share/slovak/errmsg.txt:
  Merge with 4.1
sql/share/spanish/errmsg.txt:
  Merge with 4.1
sql/share/swedish/errmsg.txt:
  Merge with 4.1
sql/share/ukrainian/errmsg.txt:
  Merge with 4.1
sql/sql_base.cc:
  Merge with 4.1
sql/sql_class.cc:
  Merge with 4.1
  Use arena code from 4.1
sql/sql_class.h:
  Merge with 4.1
  Use arena code from 4.1
sql/sql_derived.cc:
  Merge with 4.1
sql/sql_lex.cc:
  Merge with 4.1
sql/sql_lex.h:
  Merge with 4.1
sql/sql_parse.cc:
  Merge with 4.1
sql/sql_prepare.cc:
  Merge with 4.1
sql/sql_select.cc:
  Merge with 4.1
sql/sql_table.cc:
  Merge with 4.1
sql/sql_union.cc:
  Merge with 4.1
sql/sql_yacc.yy:
  Merge with 4.1
sql/tztime.cc:
  Merge with 4.1
tests/client_test.c:
  Merge with 4.1
2004-09-06 15:14:10 +03:00
..
ftbench
.cvsignore
ChangeLog
ft_boolean_search.c Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173) 2004-06-18 03:02:29 +03:00
ft_eval.c
ft_eval.h
ft_nlq_search.c Portability fixes 2004-05-19 05:09:10 +03:00
ft_parser.c backport bug#2708 fix from 4.1 2004-05-27 21:14:59 +02:00
ft_static.c ft_boolean_syntax made changeable 2004-02-16 18:53:00 +01:00
ft_stem.c
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
ft_test1.h
ft_update.c BTREE-indexes in HEAP tables can now be used to optimize ORDER BY 2004-03-25 15:05:01 +02:00
ftdefs.h bug in my_strnncoll_utf8 (and friends) fixed 2004-08-30 08:37:36 +02:00
fulltext.h
make-ccc
Makefile.am after merge fix 2004-08-20 22:54:42 +02:00
mi_cache.c
mi_changed.c
mi_check.c BUG#5327 - mi_sort_index() of 2-level tree 2004-09-03 22:04:08 +02:00
mi_checksum.c
mi_close.c Merge key cache structures to one 2003-11-20 22:06:25 +02:00
mi_create.c Merging 2004-05-27 16:32:49 +05:00
mi_dbug.c Merge with 4.0.17 2003-12-17 17:35:34 +02:00
mi_delete.c Bug#3808 - fulltext index, delete, 2-level tree, the word on the 1st level has different length than the key (latin1_german2_ci) 2004-06-25 13:11:02 +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 assert.h needed for my_dbug.h now is included in my_dbug.h, where it for 2004-06-10 23:58:39 +04:00
mi_extra.c WL#1648 - Start/Stop Inserting Duplicates Into a Table 2004-03-18 16:47:16 +01:00
mi_info.c myisam_data_pointer_size 2004-05-01 15:41:59 +02:00
mi_key.c Portability fixes 2004-08-26 18:26:38 +03:00
mi_keycache.c mi_keycache.c: 2003-11-25 22:20:31 -08:00
mi_locking.c Fixed many compiler warnings 2004-04-05 13:56:05 +03:00
mi_log.c Code cleanup 2004-01-19 23:51:17 +01:00
mi_open.c assert.h needed for my_dbug.h now is included in my_dbug.h, where it for 2004-06-10 23:58:39 +04:00
mi_packrec.c just tried to find all 'skipp' and replace it with 'skip'. 2004-02-02 20:25:39 +04:00
mi_page.c Code cleanup 2004-01-19 23:51:17 +01: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 Merging 2004-05-27 16:32:49 +05:00
mi_rename.c Code cleanup 2004-01-19 23:51:17 +01:00
mi_rfirst.c
mi_rkey.c WL#1163 To make spatial code optional 2004-03-12 18:51:03 +04:00
mi_rlast.c
mi_rnext.c Merging 2004-05-27 16:32:49 +05:00
mi_rnext_same.c WL#1163 To make spatial code optional 2004-03-12 18:51:03 +04: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
mi_rsamepos.c
mi_scan.c
mi_search.c space-stripping in _mi_prefix_search: BUG#5284 2004-08-30 16:12:53 +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 Merge with 4.0 2004-09-01 04:12:09 +03: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 Merge key cache structures to one 2003-11-20 22:06:25 +02:00
mi_test_all.res
mi_test_all.sh
mi_unique.c After merge fixes 2004-06-21 10:21:20 +03:00
mi_update.c Code cleanup 2004-01-19 23:51:17 +01:00
mi_write.c assert.h needed for my_dbug.h now is included in my_dbug.h, where it for 2004-06-10 23:58:39 +04:00
myisam_ftdump.c Merge with 4.0 2004-09-01 04:12:09 +03:00
myisamchk.c Merge with 4.1 2004-09-06 15:14:10 +03:00
myisamdef.h After merge fixes 2004-07-12 07:43:38 +03:00
myisamlog.c Fix skipp -> skip once and for all. 2004-06-03 11:52:54 -05:00
myisampack.c Merge with 4.0 2004-09-01 04:12:09 +03:00
NEWS
rt_index.c Merging 2004-06-02 19:17:35 +05: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 portability fix 2004-06-03 02:13:19 +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 Merging 2004-06-02 19:17:35 +05:00
sort.c Merge with 4.1 2004-09-06 15:14:10 +03:00
sp_defs.h WL#1163 To make spatial code optional 2004-03-12 18:51:03 +04:00
sp_key.c WL#1163 To make spatial code optional 2004-03-12 18:51:03 +04:00
sp_test.c Merging 2004-05-27 16:32:49 +05:00
test_pack
TODO