Commit 8dab39db authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into serg.mylan:/usr/home/serg/Abk/mysql-5.1
parents e482069f 393c9385

include/my_global.h

+3 −0
Original line number Diff line number Diff line
@@ -797,6 +797,9 @@ typedef SOCKET_SIZE_TYPE size_socket; 
#define DBL_MAX		1.79769313486231470e+308

#define FLT_MAX		((float)3.40282346638528860e+38)

#endif

#ifndef SSIZE_MAX

#define SSIZE_MAX ((~((size_t) 0)) / 2)

#endif



#if !defined(HAVE_ISINF) && !defined(isinf)

#define isinf(X)    0

mysql-test/r/fulltext2.result

+8 −0
Original line number Diff line number Diff line
@@ -241,3 +241,11 @@ select * from t1 where match a against('ab c' in boolean mode); 
a

drop table t1;

set names latin1;

SET NAMES utf8;

CREATE TABLE t1(a VARCHAR(255), FULLTEXT(a)) ENGINE=MyISAM DEFAULT CHARSET=utf8;

INSERT INTO t1 VALUES('„MySQL“');

SELECT a FROM t1 WHERE MATCH a AGAINST('“MySQL„' IN BOOLEAN MODE);

a

„MySQL“

DROP TABLE t1;

SET NAMES latin1;

mysql-test/t/fulltext2.test

+10 −0
Original line number Diff line number Diff line
@@ -221,3 +221,13 @@ drop table t1; 
set names latin1;



# End of 4.1 tests



#

# BUG#19580 - FULLTEXT search produces wrong results on UTF-8 columns

#

SET NAMES utf8;

CREATE TABLE t1(a VARCHAR(255), FULLTEXT(a)) ENGINE=MyISAM DEFAULT CHARSET=utf8;

INSERT INTO t1 VALUES('„MySQL“');

SELECT a FROM t1 WHERE MATCH a AGAINST('“MySQL„' IN BOOLEAN MODE);

DROP TABLE t1;

SET NAMES latin1;

sql/ha_ndbcluster.cc

+3 −3
Original line number Diff line number Diff line
@@ -10364,7 +10364,7 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, 
      table->field[c++]->set_null(); // DELETED_ROWS

      table->field[c++]->set_null(); // UPDATE_COUNT

      table->field[c++]->store(lfg.getUndoFreeWords()); // FREE_EXTENTS

      table->field[c++]->store(lfg.getUndoBufferSize()); // TOTAL_EXTENTS

      table->field[c++]->store(uf.getSize()/4); // TOTAL_EXTENTS

      table->field[c++]->store(4); // EXTENT_SIZE



      table->field[c++]->store(uf.getSize()); // INITIAL_SIZE
@@ -10394,8 +10394,8 @@ static int ndbcluster_fill_files_table(THD *thd, TABLE_LIST *tables, 


      table->field[c++]->store("NORMAL", 6, system_charset_info);



      char extra[30];

      int len= my_snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u",id);

      char extra[100];

      int len= my_snprintf(extra,sizeof(extra),"CLUSTER_NODE=%u;UNDO_BUFFER_SIZE=%lu",id,lfg.getUndoBufferSize());

      table->field[c]->store(extra, len, system_charset_info);

      schema_table_store_record(thd, table);

    }

sql/mysqld.cc

+4 −3
Original line number Diff line number Diff line
@@ -6156,7 +6156,8 @@ The minimum value for this variable is 4096.", 
   "Each thread that does a sequential scan allocates a buffer of this size for each table it scans. If you do many sequential scans, you may want to increase this value.",

   (gptr*) &global_system_variables.read_buff_size,

   (gptr*) &max_system_variables.read_buff_size,0, GET_ULONG, REQUIRED_ARG,

   128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE, 0},

   128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, SSIZE_MAX, MALLOC_OVERHEAD, IO_SIZE,

   0},

  {"read_only", OPT_READONLY,

   "Make all non-temporary tables read-only, with the exception for replication (slave) threads and users with the SUPER privilege",

   (gptr*) &opt_readonly,
@@ -6167,12 +6168,12 @@ The minimum value for this variable is 4096.", 
   (gptr*) &global_system_variables.read_rnd_buff_size,

   (gptr*) &max_system_variables.read_rnd_buff_size, 0,

   GET_ULONG, REQUIRED_ARG, 256*1024L, IO_SIZE*2+MALLOC_OVERHEAD,

   ~0L, MALLOC_OVERHEAD, IO_SIZE, 0},

   SSIZE_MAX, MALLOC_OVERHEAD, IO_SIZE, 0},

  {"record_buffer", OPT_RECORD_BUFFER,

   "Alias for read_buffer_size",

   (gptr*) &global_system_variables.read_buff_size,

   (gptr*) &max_system_variables.read_buff_size,0, GET_ULONG, REQUIRED_ARG,

   128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, ~0L, MALLOC_OVERHEAD, IO_SIZE, 0},

   128*1024L, IO_SIZE*2+MALLOC_OVERHEAD, SSIZE_MAX, MALLOC_OVERHEAD, IO_SIZE, 0},

#ifdef HAVE_REPLICATION

  {"relay_log_purge", OPT_RELAY_LOG_PURGE,

   "0 = do not purge relay logs. 1 = purge them as soon as they are no more needed.",