mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage
History
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
..
archive fix include path in windows build 2006-05-03 15:58:16 -07:00
bdb Some changes to make it possible to build for Windows with CMake from 2006-03-24 22:50:56 +01:00
blackhole fix include path in windows build 2006-05-03 15:58:16 -07:00
csv fix include path in windows build 2006-05-03 15:58:16 -07:00
example WL#3201 additional post-review fixes 2006-05-02 04:11:00 -07:00
heap Merge mysql.com:/home/my/mysql-5.0 2006-05-04 15:58:30 +03:00
innobase Merge xiphis.org:/home/antony/work2/mysql-5.1 2006-05-01 22:45:31 -07:00
myisam Merge mysql.com:/home/my/mysql-5.0 2006-05-04 15:58:30 +03:00
myisammrg Some changes to make it possible to build for Windows with CMake from 2006-03-24 22:50:56 +01:00
ndb Merge mysql.com:/home/my/mysql-5.0 2006-05-04 15:58:30 +03:00
Makefile.am fixes for 'make dist' and 'make distcheck' 2006-04-12 14:08:24 +02:00