Commit d078687a authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0-ndb
parents 3705bf9d 7eb38d6c

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ extra/my_print_defaults 
extra/mysql_install

extra/mysql_tzinfo_to_sql

extra/mysql_waitpid

extra/mysqld_ername.h

extra/mysqld_error.h

extra/perror

extra/replace

Build-tools/Do-compile

+9 −4
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ $opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env=""; 
$opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix="";

$opt_tmp=$opt_version_suffix="";

$opt_bundled_zlib=$opt_help=$opt_delete=$opt_debug=$opt_stage=$opt_no_test=$opt_no_perl=$opt_one_error=$opt_with_low_memory=$opt_fast_benchmark=$opt_static_client=$opt_static_server=$opt_static_perl=$opt_sur=$opt_with_small_disk=$opt_local_perl=$opt_tcpip=$opt_build_thread=$opt_use_old_distribution=$opt_enable_shared=$opt_no_crash_me=$opt_no_strip=$opt_with_archive=$opt_with_cluster=$opt_with_csv=$opt_with_example=$opt_with_debug=$opt_no_benchmark=$opt_no_mysqltest=$opt_without_embedded=$opt_readline=0;

$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=0;

$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=$opt_with_federated=0;



GetOptions(

	"bdb",
@@ -58,8 +58,9 @@ GetOptions( 
	"with-archive",

	"with-cluster",

	"with-csv",

	"with-example",

	"with-debug",

	"with-example",

  "with-federated",

	"with-low-memory",

	"with-other-libc=s",

	"with-small-disk",
@@ -283,6 +284,7 @@ if ($opt_stage <= 1) 
  $opt_config_options.= " --with-ndbcluster" if ($opt_with_cluster);

  $opt_config_options.= " --with-csv-storage-engine" if ($opt_with_csv);

  $opt_config_options.= " --with-example-storage-engine" if ($opt_with_example);

  $opt_config_options.= " --with-federated-storage-engine" if ($opt_with_federated);



  # Only enable InnoDB when requested (required to be able to

  # build the "Classic" packages that do not include InnoDB)
@@ -640,10 +642,10 @@ If user is empty then no mail is sent. 
--version-suffix=suffix

Set name suffix (e.g. 'com' or '-max') for a distribution



--with archive

--with-archive

Enable the Archive storage engine



--with cluster

--with-cluster

Compile and test with NDB Cluster enabled



--with-csv
@@ -652,6 +654,9 @@ Enable the CSV storage engine 
--with-example

Enable the Example storage engine



--with-federated

Enable the Federated storage engine



--with-debug

Build binaries with debug information (implies "--no-strip")

client/mysqltest.c

+5 −0
Original line number Diff line number Diff line
@@ -2321,6 +2321,9 @@ static struct my_option my_long_options[] = 
  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

};





#include <help_start.h>



static void print_version(void)

{

  printf("%s  Ver %s Distrib %s, for %s (%s)\n",my_progname,MTEST_VERSION,
@@ -2339,6 +2342,8 @@ void usage() 
  my_print_variables(my_long_options);

}



#include <help_end.h>





static my_bool

get_one_option(int optid, const struct my_option *opt __attribute__((unused)),

extra/Makefile.am

+3 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include \ 
			-I$(top_srcdir)/extra

LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \

			../dbug/libdbug.a ../strings/libmystrings.a

BUILT_SOURCES=		mysqld_error.h sql_state.h

BUILT_SOURCES=		mysqld_error.h sql_state.h mysqld_ername.h

pkginclude_HEADERS=	$(BUILT_SOURCES)

created_sources = 	created_include_files

CLEANFILES =		$(created_sources)
@@ -29,10 +29,11 @@ all: $(created_sources) 


# This will build mysqld_error.h and sql_state.h

mysqld_error.h: created_include_files

mysqld_ername.h: created_include_files

sql_state.h:	created_include_files



created_include_files: comp_err

	$(top_builddir)/extra/comp_err --charset=$(srcdir)/../sql/share/charsets --out-dir=$(top_builddir)/sql/share/ --header_file=$(top_builddir)/extra/mysqld_error.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=$(srcdir)/../sql/share/errmsg.txt

	$(top_builddir)/extra/comp_err --charset=$(srcdir)/../sql/share/charsets --out-dir=$(top_builddir)/sql/share/ --header_file=$(top_builddir)/extra/mysqld_error.h --name_file=$(top_builddir)/extra/mysqld_ername.h --state_file=$(top_builddir)/extra/sql_state.h --in_file=$(srcdir)/../sql/share/errmsg.txt

	touch created_include_files



bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \

extra/comp_err.c

+16 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#define ER_PREFIX "ER_"

static char *OUTFILE= (char*) "errmsg.sys";

static char *HEADERFILE= (char*) "mysqld_error.h";

static char *NAMEFILE= (char*) "mysqld_ername.h";

static char *STATEFILE= (char*) "sql_state.h";

static char *TXTFILE= (char*) "../sql/share/errmsg.txt";

static char *DATADIR= (char*) "../sql/share/";
@@ -117,6 +118,8 @@ static struct my_option my_long_options[]= 
   (gptr *) & OUTFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"header_file", 'H', "mysqld_error.h file ", (gptr *) & HEADERFILE,

   (gptr *) & HEADERFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"name_file", 'N', "mysqld_ername.h file ", (gptr *) & NAMEFILE,

   (gptr *) & NAMEFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"state_file", 'S', "sql_state.h file", (gptr *) & STATEFILE,

   (gptr *) & STATEFILE, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
@@ -192,7 +195,7 @@ int main(int argc, char *argv[]) 
static int create_header_files(struct errors *error_head)

{

  uint er_last;

  FILE *er_definef, *sql_statef;

  FILE *er_definef, *sql_statef, *er_namef;

  struct errors *tmp_error;

  DBUG_ENTER("create_header_files");

  LINT_INIT(er_last);
@@ -206,9 +209,16 @@ static int create_header_files(struct errors *error_head) 
    my_fclose(er_definef, MYF(0));

    DBUG_RETURN(1);

  }

  if (!(er_namef= my_fopen(NAMEFILE, O_WRONLY, MYF(MY_WME))))

  {

    my_fclose(er_definef, MYF(0));

    my_fclose(sql_statef, MYF(0));

    DBUG_RETURN(1);

  }



  fprintf(er_definef, "/* Autogenerated file, please don't edit */\n\n");

  fprintf(sql_statef, "/* Autogenerated file, please don't edit */\n\n");

  fprintf(er_namef, "/* Autogenerated file, please don't edit */\n\n");



  fprintf(er_definef, "#define ER_ERROR_FIRST %d\n", error_head->d_code);
@@ -227,11 +237,16 @@ static int create_header_files(struct errors *error_head) 
      fprintf(sql_statef,

	      "%-40s,\"%s\", \"%s\",\n", tmp_error->er_name,

	      tmp_error->sql_code1, tmp_error->sql_code2);

    /*generating er_name file */

    fprintf(er_namef, "{ \"%s\", %d },\n", tmp_error->er_name,

	    tmp_error->d_code);



  }

  /* finishing off with mysqld_error.h */

  fprintf(er_definef, "#define ER_ERROR_LAST %d\n", er_last);

  my_fclose(er_definef, MYF(0));

  my_fclose(sql_statef, MYF(0));

  my_fclose(er_namef, MYF(0));

  DBUG_RETURN(0);

}