Commit 2f603156 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Cleanup after last merge

parent 938a8dc2

client/mysqltest.c

+9 −5
Original line number Diff line number Diff line
@@ -1718,7 +1718,7 @@ int parse_args(int argc, char **argv) 
    {

      switch(c)	{

      case '#':

	DBUG_PUSH(optarg ? optarg : "d:t:i:O,/tmp/mysqltest.trace");

	DBUG_PUSH(optarg ? optarg : "d:t:S:i:O,/tmp/mysqltest.trace");

	break;

      case 'v':

	verbose = 1;
@@ -1952,8 +1952,14 @@ int run_query(MYSQL* mysql, struct st_query* q, int flags) 
      {

	if ((q->expected_errno[i] == mysql_errno(mysql)))

	{

	  if (i == 0 && q->expected_errno[1] == 0)

	  {

	    /* Only log error if there is one possible error */

	    dynstr_append(ds,mysql_error(mysql));

	    dynstr_append_mem(ds,"\n",1);

	  }

	  else

	    dynstr_append(ds,"Got one of the listed errors\n");

	  goto end;				/* Ok */

	}

      }
@@ -2153,8 +2159,6 @@ int main(int argc, char** argv) 
  struct st_query* q;

  my_bool require_file=0, q_send_flag=0;

  char save_file[FN_REFLEN];

  mysql_server_init(sizeof(embedded_server_args) / sizeof(char *) - 1,

		    embedded_server_args, embedded_server_groups);

  MY_INIT(argv[0]);

  {

  DBUG_ENTER("main");

include/mysqld_error.h

+2 −4
Original line number Diff line number Diff line
@@ -221,7 +221,5 @@ 
#define ER_WRONG_NUMBER_OF_COLUMNS_IN_SELECT 1218

#define ER_CANT_UPDATE_WITH_READLOCK 1219

#define ER_MIXING_NOT_ALLOWED 1220

#define ER_GRANT_DUPL_SUBJECT 1221

#define ER_GRANT_DUPL_ISSUER 1222

#define ER_GRANT_DUPL_CIPHER 1223

#define ER_ERROR_MESSAGES 224
 
#define ER_DUP_ARGUMENT 1221

#define ER_ERROR_MESSAGES 222

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ 
	hostname.cc init.cc \

	item.cc item_buff.cc item_cmpfunc.cc item_create.cc \

	item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \

	item_uniq.cc key.cc lock.cc log.cc log_event.cc md5.c \

	item_uniq.cc key.cc lock.cc log.cc log_event.cc \

	mini_client.cc net_pkg.cc net_serv.cc opt_ft.cc opt_range.cc \

	opt_sum.cc procedure.cc records.cc slave.cc sql_acl.cc \

	sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \

mysql-test/include/have_isam.inc

+2 −0
Original line number Diff line number Diff line 
-- require r/have_isam.require

disable_query_log;

show variables like "have_isam";

enable_query_log;

mysql-test/include/not_embedded.inc

+2 −0
Original line number Diff line number Diff line 
-- require r/not_embedded.require

disable_query_log;

select version() like "%embedded%" as "have_embedded";

enable_query_log;