Commit 3c099551 authored by unknown's avatar unknown
Browse files

Cleanups after review of WL#602 

Fixed warnings from test suite
Some fixes in mysql-test-run script to catch more warnings


mysql-test/lib/mtr_report.pl:
  Catch more warnings
mysql-test/mysql-test-run.sh:
  Catch warnings from mysqld
mysql-test/t/mysqldump.test:
  Add key_block_size to catch future changes in information schema
mysys/errors.c:
  Ensure that mysql-test-run catches if we call my_close() too many times
sql/handler.cc:
  Initialize all elements
sql/log.cc:
  true -> TRUE
sql/sql_class.h:
  Review change: key_info -> key_create_info
sql/sql_lex.h:
  Review change: key_info -> key_create_info
sql/sql_table.cc:
  Review change: key_info -> key_create_info
  Don't call mysql_close() if init_ddl_log is not called.
  Better error handling in init_ddl_log
sql/sql_yacc.yy:
  Review change: key_info -> key_create_info
parent 8e2650ab

mysql-test/lib/mtr_report.pl

+3 −1
Original line number Diff line number Diff line
@@ -217,7 +217,9 @@ sub mtr_report_stats ($) { 
      my $found_problems= 0;            # Some warnings are errors...



      # We report different types of problems in order

      foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x" )

      foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x",

			    "InnoDB: Warning", "missing DBUG_RETURN",

			    "mysqld: Warning")

      {

        foreach my $errlog ( sort glob("$::opt_vardir/log/*.err") )

        {

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -1079,7 +1079,7 @@ report_stats () { 


    found_error=0

    # Find errors

    for i in "^Warning:" "^Error:" "^==.* at 0x" "InnoDB: Warning" "missing DBUG_RETURN"

    for i in "^Warning:" "^Error:" "^==.* at 0x" "InnoDB: Warning" "missing DBUG_RETURN" "mysqld: Warning"

    do

      if $GREP "$i" $MY_LOG_DIR/warnings.tmp >> $MY_LOG_DIR/warnings

      then

mysql-test/t/mysqldump.test

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ drop view if exists v1, v2, v3; 


# XML output



CREATE TABLE t1(a int);

CREATE TABLE t1(a int, key (a)) key_block_size=1024;

INSERT INTO t1 VALUES (1), (2);

--exec $MYSQL_DUMP --skip-create --skip-comments -X test t1

DROP TABLE t1;

mysys/errors.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ const char * NEAR globerrs[GLOBERRS]= 
  "Can't get working dirctory (Errcode: %d)",

  "Can't change dir to '%s' (Errcode: %d)",

  "Warning: '%s' had %d links",

  "%d files and %d streams is left open\n",

  "Warning: %d files and %d streams is left open\n",

  "Disk is full writing '%s' (Errcode: %d). Waiting for someone to free space... Retry in %d secs",

  "Can't create directory '%s' (Errcode: %d)",

  "Character set '%s' is not a compiled character set and is not specified in the '%s' file",
@@ -78,7 +78,7 @@ void init_glob_errs() 
  EE(EE_GETWD)		= "Can't get working dirctory (Errcode: %d)";

  EE(EE_SETWD)		= "Can't change dir to '%s' (Errcode: %d)";

  EE(EE_LINK_WARNING)	= "Warning: '%s' had %d links";

  EE(EE_OPEN_WARNING)	= "%d files and %d streams is left open\n";

  EE(EE_OPEN_WARNING)	= "Warning: %d files and %d streams is left open\n";

  EE(EE_DISK_FULL)	= "Disk is full writing '%s'. Waiting for someone to free space...";

  EE(EE_CANT_MKDIR)	="Can't create directory '%s' (Errcode: %d)";

  EE(EE_UNKNOWN_CHARSET)= "Character set '%s' is not a compiled character set and is not specified in the %s file";

sql/handler.cc

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ extern handlerton *sys_table_types[]; 


#define BITMAP_STACKBUF_SIZE (128/8)



KEY_CREATE_INFO default_key_create_info= { HA_KEY_ALG_UNDEF, 0 };

KEY_CREATE_INFO default_key_create_info= { HA_KEY_ALG_UNDEF, 0, {NullS,0} };



/* static functions defined in this file */