mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/heap
History
unknown 555eb848f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/my/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
include/heap.h:
  Auto merged
include/my_base.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ndb_index_unique.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_partition.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/spatial.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_bitmap.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/archive/ha_archive.cc:
  Auto merged
storage/archive/ha_archive.h:
  Auto merged
storage/example/ha_example.cc:
  Auto merged
storage/myisam/ft_boolean_search.c:
  Auto merged
unittest/mysys/base64-t.c:
  Auto merged
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/t/innodb_mysql.test:
  manual merge
mysql-test/valgrind.supp:
  manual merge
sql/event.cc:
  manual merge
sql/ha_heap.cc:
  manual merge
sql/ha_myisam.cc:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/ha_ndbcluster_binlog.cc:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/handler.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/handler.h:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/item.h:
  automatic merge
sql/item_cmpfunc.cc:
  automatic merge
sql/log_event.cc:
  manual merge
  Trivial cleanup
sql/mysql_priv.h:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/opt_range.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_delete.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_insert.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_load.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_select.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_show.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_table.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/sql_update.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
sql/table.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
storage/blackhole/ha_blackhole.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
storage/csv/ha_tina.cc:
  manual merge
  renamed print_key_dupp_error to print_key_dup_error
mysql-test/valgrind.supp.orig:
  Manual merge
2006-06-04 21:05:22 +03:00
..
.cvsignore Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
_check.c Merge mysql.com:/home/my/mysql-5.0 2005-11-05 01:32:55 +02:00
_rectest.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ChangeLog Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
CMakeLists.txt performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1. 2006-05-11 11:29:08 -05:00
heapdef.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_block.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_clear.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_close.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_create.c Merge april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0 2006-05-18 18:49:52 +05:00
hp_delete.c Merge mysql.com:/home/my/mysql-5.0 2006-05-04 15:58:30 +03:00
hp_extra.c This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
hp_hash.c Merge 2005-09-12 14:22:06 +02:00
hp_info.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_open.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_panic.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rename.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rfirst.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rkey.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rlast.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rnext.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rprev.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rrnd.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_rsame.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_scan.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_static.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_test1.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
hp_test2.c This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes 2006-06-04 18:52:22 +03:00
hp_update.c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-06-15 20:07:31 +02:00
hp_write.c Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 2006-05-30 16:07:49 +03:00
make-ccc Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Makefile.am Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00