mariadb/storage/heap
unknown d6df18dd33 Merge kaamos.(none):/data/src/mysql-5.1
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.
sql-common/client.c:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
2008-03-12 11:19:46 +03:00
..
.cvsignore
_check.c
_rectest.c
ChangeLog
CMakeLists.txt Bug#31929 Windows build fails with >=4 Parallel build threads. 2008-01-29 21:58:57 -05:00
ha_heap.cc Bug #31326: No compile check of order of initializations 2007-12-14 15:21:37 +02:00
ha_heap.h Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
heapdef.h Added support for 'internal temporary tables' in HEAP tables. 2007-07-25 01:58:12 +03:00
hp_block.c
hp_clear.c
hp_close.c Added support for 'internal temporary tables' in HEAP tables. 2007-07-25 01:58:12 +03:00
hp_create.c Added support for 'internal temporary tables' in HEAP tables. 2007-07-25 01:58:12 +03:00
hp_delete.c Merge mysql.com:/home/svoj/devel/mysql/BUG30590/mysql-5.0-engines 2007-09-13 17:12:46 +05:00
hp_extra.c
hp_hash.c Merge bk-internal.mysql.com:/home/bk/mysql-5.1 2007-06-01 12:12:06 +04:00
hp_info.c
hp_open.c Added support for 'internal temporary tables' in HEAP tables. 2007-07-25 01:58:12 +03:00
hp_panic.c
hp_rename.c
hp_rfirst.c Merge mysql.com:/home/svoj/devel/mysql/BUG30590/mysql-5.0-engines 2007-09-13 17:12:46 +05:00
hp_rkey.c
hp_rlast.c
hp_rnext.c Merge mysql.com:/home/svoj/devel/mysql/BUG30590/mysql-5.0-engines 2007-09-13 17:12:46 +05:00
hp_rprev.c
hp_rrnd.c
hp_rsame.c
hp_scan.c
hp_static.c
hp_test1.c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
hp_test2.c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 2007-08-13 16:11:25 +03:00
hp_update.c Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> 2008-02-18 23:29:39 +01:00
hp_write.c
make-ccc
Makefile.am
plug.in