Commit be7d46a9 authored by unknown's avatar unknown
Browse files

Merge 


client/Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
configure.in:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmclient/ndb_mgmclient.hpp:
  Auto merged
ndb/src/mgmclient/ndb_mgmclient.h:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  SCCS merged
parents 18f12ee4 1af6e72e

client/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ bin_PROGRAMS = mysql mysqladmin mysqlcheck mysqlshow \ 
 mysqldump mysqlimport mysqltest mysqlbinlog mysqlmanagerc mysqlmanager-pwgen

noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h

mysqladmin_SOURCES =		mysqladmin.cc

mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc

mysqladmin_SOURCES =		mysqladmin.cc

mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)

innobase/fil/fil0fil.c

+16 −3
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ struct fil_node_struct { 
				device or a raw disk partition */

	ulint		size;	/* size of the file in database pages, 0 if

				not known yet; the possible last incomplete

				megabyte is ignored if space == 0 */

				megabyte may be ignored if space == 0 */

	ulint		n_pending;

				/* count of pending i/o's on this file;

				closing of the file is not allowed if
@@ -160,7 +160,9 @@ struct fil_space_struct { 
	UT_LIST_BASE_NODE_T(fil_node_t) chain;

				/* base node for the file chain */

	ulint		size;	/* space size in pages; 0 if a single-table

				tablespace whose size we do not know yet */

				tablespace whose size we do not know yet;

				last incomplete megabytes in data files may be

				ignored if space == 0 */ 

	ulint		n_reserved_extents;

				/* number of reserved free extents for

				ongoing operations like B-tree page split */
@@ -3255,7 +3257,7 @@ fil_extend_space_to_desired_size( 
	ulint*	actual_size,	/* out: size of the space after extension;

				if we ran out of disk space this may be lower

				than the desired size */

	ulint	space_id,	/* in: space id, must be != 0 */

	ulint	space_id,	/* in: space id */

	ulint	size_after_extend)/* in: desired size in pages after the

				extension; if the current space size is bigger

				than this already, the function does nothing */
@@ -3352,6 +3354,17 @@ fil_extend_space_to_desired_size( 
	fil_node_complete_io(node, system, OS_FILE_WRITE);



	*actual_size = space->size;



	if (space_id == 0) {

		ulint pages_per_mb = (1024 * 1024) / UNIV_PAGE_SIZE;



		/* Keep the last data file size info up to date, rounded to

		full megabytes */



		srv_data_file_sizes[srv_n_data_files - 1] =

				(node->size / pages_per_mb) * pages_per_mb;

	}



	/*

        printf("Extended %s to %lu, actual size %lu pages\n", space->name,

                                        size_after_extend, *actual_size); */

innobase/include/fil0fil.h

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ fil_extend_space_to_desired_size( 
	ulint*	actual_size,	/* out: size of the space after extension;

				if we ran out of disk space this may be lower

				than the desired size */

	ulint	space_id,	/* in: space id, must be != 0 */

	ulint	space_id,	/* in: space id */

	ulint	size_after_extend);/* in: desired size in pages after the

				extension; if the current space size is bigger

				than this already, the function does nothing */

ndb/include/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ ndbapi/NdbIndexScanOperation.hpp \ 
ndbapi/ndberror.h



mgmapiinclude_HEADERS = \

mgmapi/LocalConfig.hpp \

mgmapi/mgmapi.h \

mgmapi/mgmapi_debug.h

ndb/src/mgmclient/CommandInterpreter.cpp

+6 −1
Original line number Diff line number Diff line
@@ -1374,7 +1374,7 @@ void 
CommandInterpreter::executeDumpState(int processId, const char* parameters,

				     bool all) 

{

  if(parameters == 0 || strlen(parameters) == 0){

  if(emptyString(parameters)){

    ndbout << "Expected argument" << endl;

    return;

  }
@@ -1794,6 +1794,10 @@ CommandInterpreter::executeEventReporting(int processId, 
					  const char* parameters, 

					  bool all) 

{

  if (emptyString(parameters)) {

    ndbout << "Expected argument" << endl;

    return;

  }

  connect();



  BaseString tmp(parameters);
@@ -1894,6 +1898,7 @@ void 
CommandInterpreter::executeAbortBackup(char* parameters) 

{

  connect();



  strtok(parameters, " ");

  struct ndb_mgm_reply reply;

  char* id = strtok(NULL, "\0");