mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 20:11:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/ndb/include/ndbapi
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
..
Ndb.hpp ndb - rbr blobs etc: set db/schema in injector_ndb before calling NDB 2006-02-20 12:07:12 +01:00
ndb_cluster_connection.hpp manual merge 2006-02-13 14:25:31 +01:00
ndb_opt_defaults.h Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbApi.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
ndbapi_limits.h Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 2005-05-20 06:25:02 +02:00
NdbBlob.hpp Merge mysql.com:/home/my/mysql-5.0 2006-05-04 15:58:30 +03:00
NdbDictionary.hpp BUG#18094 Slave caches invalid table definition after atlters causes select failure 2006-04-19 14:54:39 +02:00
ndberror.h wl2325 wl2324 2006-01-12 19:51:02 +01:00
NdbError.hpp wl2325 wl2324 2006-01-12 19:51:02 +01:00
NdbEventOperation.hpp NdbEventOperationImpl.cpp, NdbEventOperation.cpp, NdbEventOperation.hpp: 2006-02-08 09:58:47 +01:00
NdbIndexOperation.hpp Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 2006-03-23 22:39:30 +01:00
NdbIndexScanOperation.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
NdbIndexStat.hpp Fixed compiler and valgrind warnings 2006-03-29 14:27:36 +03:00
NdbOperation.hpp Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 2006-03-23 22:39:30 +01:00
NdbPool.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbRecAttr.hpp Import ndb varsize 2005-11-07 12:19:28 +01:00
NdbReceiver.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbScanFilter.hpp Changes to create storage directory for storage engines. 2005-04-26 18:19:54 -07:00
NdbScanOperation.hpp Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.0 2006-03-23 22:39:30 +01:00
NdbTransaction.hpp ndb: removed TransporterFacade singleton 2006-03-22 17:28:45 +01:00