mariadb/storage/heap
unknown 1f89605e4b Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/r/ndb_blob.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
storage/heap/hp_delete.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/myisamlog.c:
  Auto merged
storage/ndb/include/kernel/signaldata/TcKeyReq.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbBlob.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/tools/delete_all.cpp:
  Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
  Use original file (my_user.c was already added in 5.1)
mysql-test/mysql-test-run.pl:
  Manual merge
sql/handler.h:
  Manual merge
sql/share/errmsg.txt:
  Align error messages with 5.0
sql/sql_table.cc:
  Manual merge
storage/ndb/src/ndbapi/NdbBlob.cpp:
  No changes
2006-05-04 15:58:30 +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 Moved cmake scripts into the proper directories 2006-03-15 10:22:12 -06: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 mysql.com:/home/kostja/mysql/tmp_merge 2006-02-08 23:53:45 +03:00
hp_delete.c Merge mysql.com:/home/my/mysql-5.0 2006-05-04 15:58:30 +03:00
hp_extra.c Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07: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 dbug changes: 2006-02-14 22:36:11 +01: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 Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
make-ccc Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
Makefile.am Some changes to make it possible to build for Windows with CMake from 2006-03-24 22:50:56 +01:00