Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb (b96dae00) · Commits · Software / OSDI20 Artifacts / mariadb

ndb/include/ndbapi/Ndb.hpp

+16 −4

Original line number	Diff line number	Diff line
		@@ -1051,6 +1051,18 @@ class Ndb
		friend class NdbDictionaryImpl;
		friend class NdbDictInterface;
		friend class NdbBlob;
		friend class Ndb_free_list_t<NdbRecAttr>;
		friend class Ndb_free_list_t<NdbApiSignal>;
		friend class Ndb_free_list_t<NdbLabel>;
		friend class Ndb_free_list_t<NdbBranch>;
		friend class Ndb_free_list_t<NdbSubroutine>;
		friend class Ndb_free_list_t<NdbCall>;
		friend class Ndb_free_list_t<NdbBlob>;
		friend class Ndb_free_list_t<NdbReceiver>;
		friend class Ndb_free_list_t<NdbIndexScanOperation>;
		friend class Ndb_free_list_t<NdbOperation>;
		friend class Ndb_free_list_t<NdbIndexOperation>;
		friend class Ndb_free_list_t<NdbTransaction>;
		#endif

		public:
		@@ -1091,7 +1103,7 @@ public:
		*
		* @param aCatalogName is the new name of the current catalog
		*/
		void setCatalogName(const char * aCatalogName);
		int setCatalogName(const char * aCatalogName);

		/**
		* The current schema name can be fetched by getSchemaName.
		@@ -1105,7 +1117,7 @@ public:
		*
		* @param aSchemaName is the new name of the current schema
		*/
		void setSchemaName(const char * aSchemaName);
		int setSchemaName(const char * aSchemaName);
		#endif

		/**
		@@ -1120,7 +1132,7 @@ public:
		*
		* @param aDatabaseName is the new name of the current database
		*/
		void setDatabaseName(const char * aDatabaseName);
		int setDatabaseName(const char * aDatabaseName);

		/**
		* The current database schema name can be fetched by getDatabaseSchemaName.
		@@ -1134,7 +1146,7 @@ public:
		*
		* @param aDatabaseSchemaName is the new name of the current database schema
		*/
		void setDatabaseSchemaName(const char * aDatabaseSchemaName);
		int setDatabaseSchemaName(const char * aDatabaseSchemaName);

		/**
		* Initializes the Ndb object

ndb/include/ndbapi/NdbDictionary.hpp

+12 −12

Original line number	Diff line number	Diff line
		@@ -358,7 +358,7 @@ public:
		* Set name of column
		* @param name Name of the column
		*/
		void setName(const char * name);
		int setName(const char * name);

		/**
		* Set whether column is nullable or not
		@@ -446,7 +446,7 @@ public:
		void setAutoIncrement(bool);
		bool getAutoIncrement() const;
		void setAutoIncrementInitialValue(Uint64 val);
		void setDefaultValue(const char*);
		int setDefaultValue(const char*);
		const char* getDefaultValue() const;

		static const Column * FRAGMENT;
		@@ -661,13 +661,13 @@ public:
		* Name of table
		* @param name Name of table
		*/
		void setName(const char * name);
		int setName(const char * name);

		/**
		* Add a column definition to a table
		* @note creates a copy
		*/
		void addColumn(const Column &);
		int addColumn(const Column &);

		/**
		* @see NdbDictionary::Table::getLogging.
		@@ -723,7 +723,7 @@ public:
		/**
		* Set frm file to store with this table
		*/
		void setFrm(const void* data, Uint32 len);
		int setFrm(const void* data, Uint32 len);

		/**
		* Set table object type
		@@ -875,26 +875,26 @@ public:
		/**
		* Set the name of an index
		*/
		void setName(const char * name);
		int setName(const char * name);

		/**
		* Define the name of the table to be indexed
		*/
		void setTable(const char * name);
		int setTable(const char * name);

		/**
		* Add a column to the index definition
		* Note that the order of columns will be in
		* the order they are added (only matters for ordered indexes).
		*/
		void addColumn(const Column & c);
		int addColumn(const Column & c);

		/**
		* Add a column name to the index definition
		* Note that the order of indexes will be in
		* the order they are added (only matters for ordered indexes).
		*/
		void addColumnName(const char * name);
		int addColumnName(const char * name);

		#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
		/**
		@@ -903,7 +903,7 @@ public:
		* the order they are added (only matters for ordered indexes).
		* Depricated, use addColumnName instead.
		*/
		void addIndexColumn(const char * name);
		int addIndexColumn(const char * name);
		#endif

		/**
		@@ -911,7 +911,7 @@ public:
		* Note that the order of indexes will be in
		* the order they are added (only matters for ordered indexes).
		*/
		void addColumnNames(unsigned noOfNames, const char ** names);
		int addColumnNames(unsigned noOfNames, const char ** names);

		#ifndef DOXYGEN_SHOULD_SKIP_DEPRECATED
		/**
		@@ -920,7 +920,7 @@ public:
		* the order they are added (only matters for ordered indexes).
		* Depricated, use addColumnNames instead.
		*/
		void addIndexColumns(int noOfNames, const char ** names);
		int addIndexColumns(int noOfNames, const char ** names);
		#endif

		/**

ndb/include/ndbapi/NdbReceiver.hpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ public:
		};

		NdbReceiver(Ndb *aNdb);
		void init(ReceiverType type, void* owner);
		int init(ReceiverType type, void* owner);
		void release();
		~NdbReceiver();

		@@ -75,7 +75,7 @@ private:
		* At setup
		*/
		class NdbRecAttr * getValue(const class NdbColumnImpl, char user_dst_ptr);
		void do_get_value(NdbReceiver*, Uint32 rows, Uint32 key_size, Uint32 range);
		int do_get_value(NdbReceiver*, Uint32 rows, Uint32 key_size, Uint32 range);
		void prepareSend();
		void calculate_batch_size(Uint32, Uint32, Uint32&, Uint32&, Uint32&);

ndb/include/ndbapi/NdbTransaction.hpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -585,7 +585,7 @@ private:
		NdbTransaction(Ndb* aNdb);
		~NdbTransaction();

		void init(); // Initialize connection object for new transaction
		int init(); // Initialize connection object for new transaction

		int executeNoBlobs(ExecType execType,
		AbortOption abortOption = AbortOnError,

ndb/include/util/BaseString.hpp

+7 −0

Original line number	Diff line number	Diff line
		@@ -185,6 +185,7 @@ public:
		private:
		char* m_chr;
		unsigned m_len;
		friend bool operator!(const BaseString& str);
		};

		inline const char*
		@@ -249,6 +250,12 @@ BaseString::operator!=(const char *str) const
		return strcmp(m_chr, str) != 0;
		}

		inline bool
		operator!(const BaseString& str)
		{
		return str.m_chr == NULL;
		}

		inline BaseString&
		BaseString::assign(const BaseString& str)
		{