database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb

Browse Source 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
This commit is contained in:
unknown
2007-06-14 16:10:11 +02:00
parent 0180e8f302 103c1eeffe
commit d168b042a9
80 changed files with 1822 additions and 632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
storage/ndb/include/ndbapi/Ndb.hpp
View File

@ -1055,6 +1055,7 @@ class Ndb
friend class NdbDictInterface;
friend class NdbBlob;
friend class NdbImpl;
friend class Ndb_internal;
#endif
public:

7
storage/ndb/include/ndbapi/NdbOperation.hpp
View File

@ -1042,6 +1042,13 @@ protected:
*/
Int8 m_abortOption;
/*
* For blob impl, option to not propagate error to trans level.
* Could be AO_IgnoreError variant if we want it public.
* Ignored unless AO_IgnoreError is also set.
*/
Int8 m_noErrorPropagation;
friend struct Ndb_free_list_t<NdbOperation>;
};