Commit 2e8d13c7 authored by unknown's avatar unknown
Browse files

After merge fixes 


config/ac-macros/character_sets.m4:
  Added latin1_spanish_ci
dbug/dbug_analyze.c:
  Remove compiler warnings
include/my_handler.h:
  Reorder structure arguments to be more optimal
innobase/dict/dict0load.c:
  Fixed wrong define tag (for MySQL 5.0)
innobase/fil/fil0fil.c:
  Fixed compiler warning
innobase/os/os0file.c:
  Fixed compiler warning
myisam/ft_boolean_search.c:
  Fixed compiler warning
myisam/ft_static.c:
  Update to use new HA_KEYSEG structure
myisam/mi_open.c:
  Simple optimization
myisammrg/myrg_static.c:
  Removed compiler warning
mysql-test/r/grant.result:
  Update results after merge
mysql-test/r/index_merge.result:
  Update results after merge
mysql-test/r/information_schema_inno.result:
  Add missing drop table
mysql-test/r/lowercase_table.result:
  safety fix
mysql-test/r/multi_update.result:
  safety fix
mysql-test/r/ps_1general.result:
  safety fix
mysql-test/r/ps_2myisam.result:
  Update results after merge
  (set is not anymore of binary type)
mysql-test/r/ps_3innodb.result:
  Update results after merge
mysql-test/r/ps_4heap.result:
  Update results after merge
mysql-test/r/ps_5merge.result:
  Update results after merge
mysql-test/r/ps_6bdb.result:
  Update results after merge
mysql-test/r/show_check.result:
  Update results after merge
mysql-test/r/subselect.result:
  Update results after merge
  (added missing quotes)
mysql-test/r/timezone2.result:
  Update results after merge
mysql-test/r/view.result:
  Update results after merge
  (note that INSERT IGNORE will work again after next merge from 4.1)
mysql-test/t/derived.test:
  Removed empty line
mysql-test/t/grant.test:
  Update results after merge
mysql-test/t/information_schema_inno.test:
  added missing drop table
mysql-test/t/lowercase_table.test:
  safety fix
mysql-test/t/multi_update.test:
  safety fix
mysql-test/t/ps_1general.test:
  safety fix
mysql-test/t/view.test:
  update error codes after merge
ndb/src/mgmsrv/main.cpp:
  after merge fix
ndb/tools/ndb_test_platform.cpp:
  removed compiler warnings
regex/main.c:
  remove compiler warnings
sql/field.cc:
  Remove compiler warning
sql/gen_lex_hash.cc:
  Added DBUG support
sql/ha_myisam.cc:
  Removed warning from valgrind
sql/ha_ndbcluster.cc:
  Remove compiler warning
sql/item_cmpfunc.cc:
  Better to use val_int() instead of val_real() as we don't want Item_func_nop_all to return different value than the original ref element
sql/mysqld.cc:
  Remove compiler warning
sql/sql_acl.cc:
  More debugging
sql/sql_lex.cc:
  Remove unnecessary 'else'
sql/sql_parse.cc:
  After merge fixes
  Simplify reset of thd->server_status for SQLCOM_CALL
sql/sql_prepare.cc:
  After merge fixes
  Removed possible core dump in mysql_stmt_fetch()
sql/sql_update.cc:
  After merge fixes (together with Sanja)
strings/ctype-czech.c:
  Remove compiler warning
strings/ctype-ucs2.c:
  Remove compiler warning
strings/ctype-win1250ch.c:
  Remove compiler warning
strings/xml.c:
  Remove compiler warning
tests/client_test.c:
  Fix test to work with 5.0
vio/test-sslserver.c:
  Portability fix
parent bb2d3eaa

config/ac-macros/character_sets.m4

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ case $default_charset in 
      ;;

    latin1)

      default_charset_default_collation="latin1_swedish_ci"

      default_charset_collations="latin1_general_ci latin1_general_cs latin1_bin latin1_german1_ci latin1_german2_ci latin1_danish_ci latin1_swedish_ci"

      default_charset_collations="latin1_general_ci latin1_general_cs latin1_bin latin1_german1_ci latin1_german2_ci latin1_danish_ci latin1_spanish_ci latin1_swedish_ci"

      ;;

    latin2)

      default_charset_default_collation="latin2_general_ci"

dbug/dbug_analyze.c

+12 −10
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 


#include <my_global.h>

#include <m_string.h>

#include <my_pthread.h>



static char *my_name;

static int verbose;
@@ -246,7 +247,7 @@ char *m_name; 
	modules[n_items].m_stkuse = 0;

	DBUG_RETURN (n_items++);

    }

    while (cmp = strcmp (m_name,modules[ind].name)) {

    while ((cmp = strcmp (m_name,modules[ind].name))) {

	if (cmp < 0) {	/* In left subtree */

	    if (s_table[ind].lchild == MAXPROCS) {

		/* Add as left child */
@@ -392,7 +393,7 @@ FILE *inf; 
      }

      break;

    default:

      fprintf (stderr, "unknown record type '%s'\n", buf[0]);

      fprintf (stderr, "unknown record type '%c'\n", buf[0]);

      break;

    }

  next_line:;
@@ -450,9 +451,10 @@ FILE *outf; 
unsigned long int sum_calls, sum_time;

{

    DBUG_ENTER ("out_trailer");

    if (verbose) {

    if (verbose)

    {

      fprintf(outf, "======\t==========\t===========\t==========\t========\n");

	fprintf (outf, "%6d\t%10.2f\t%11d\t%10.2f\t\t%-15s\n",

      fprintf(outf, "%6ld\t%10.2f\t%11ld\t%10.2f\t\t%-15s\n",

              sum_calls, 100.0, sum_time, 100.0, "Totals");

    }

    DBUG_VOID_RETURN;
@@ -488,14 +490,14 @@ unsigned long int *called, *timed; 
    import = (unsigned int) (per_time * per_calls);



    if (verbose) {

	fprintf (outf, "%6d\t%10.2f\t%11d\t%10.2f  %10d\t%-15s\n",

	fprintf (outf, "%6d\t%10.2f\t%11ld\t%10.2f  %10d\t%-15s\n",

		calls, per_calls, time, per_time, import, name);

    } else {

	ms_per_call = time;

	ms_per_call /= calls;

	ftime = time;

	ftime /= 1000;

	fprintf (outf, "%8.2f%8.3f%8u%8.3f%8.2f%8u%8u  %-s\n",

	fprintf(outf, "%8.2f%8.3f%8u%8.3f%8.2f%8u%8lu  %-s\n",

                per_time, ftime, calls, ms_per_call, per_calls, import,

                stkuse, name);

    }

include/my_handler.h

+7 −7
Original line number Diff line number Diff line
@@ -25,17 +25,17 @@ 


typedef struct st_HA_KEYSEG		/* Key-portion */

{

  CHARSET_INFO *charset;

  uint32 start;				/* Start of key in record */

  uint32 null_pos;			/* position to NULL indicator */

  uint16 bit_pos;                       /* Position to bit part */

  uint16 flag;

  uint16 length;			/* Keylength */

  uint8  type;				/* Type of key (for sort) */

  uint8  language;

  uint8  null_bit;			/* bitmask to test for NULL */

  uint8  bit_start,bit_end;		/* if bit field */

  uint16 flag;

  uint16 length;			/* Keylength */

  uint32 start;				/* Start of key in record */

  uint32 null_pos;			/* position to NULL indicator */

  CHARSET_INFO *charset;

  uint8  bit_length;                    /* Length of bit part */

  uint16 bit_pos;                       /* Position to bit part */

} HA_KEYSEG;



#define get_key_length(length,key) \

innobase/dict/dict0load.c

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Created 4/24/1996 Heikki Tuuri 
*******************************************************/



#include "dict0load.h"

#include "mysql_version.h"



#ifdef UNIV_NONINL

#include "dict0load.ic"
@@ -766,7 +767,7 @@ dict_load_table( 
		return(NULL);

	}



#if MYSQL_VERSION_ID < 50300

#if MYSQL_VERSION_ID < 50003

	/* Starting from MySQL 5.0.3, the high-order bit of MIX_LEN is the

	"compact format" flag. */

	field = rec_get_nth_field(rec, 7, &len);

innobase/fil/fil0fil.c

+3 −3
Original line number Diff line number Diff line
@@ -614,9 +614,9 @@ fil_try_to_close_file_in_LRU( 
			fputs("InnoDB: cannot close file ", stderr);

			ut_print_filename(stderr, node->name);

			fprintf(stderr,

				", because mod_count %lld != fl_count %lld\n",

				node->modification_counter,

				node->flush_counter);

				", because mod_count %ld != fl_count %ld\n",

				(long) node->modification_counter,

				(long) node->flush_counter);

		}



		node = UT_LIST_GET_PREV(LRU, node);