Commit d91953fa authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 

into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
parents 8c7f7114 ac96a2bb

.bzrignore

+2 −0
Original line number Diff line number Diff line
@@ -943,3 +943,5 @@ ac_available_languages_fragment 
libmysqld/ha_archive.cc

libmysqld/ha_example.cc

libmysqld/ha_tina.cc

analyse.test

client/mysqladmin.c

libmysql/libmysql.c

+6 −0
Original line number Diff line number Diff line
@@ -4413,6 +4413,12 @@ mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong row) 
  for (; tmp && row; --row, tmp= tmp->next)

    ;

  stmt->data_cursor= tmp;

  if (!row && tmp)

  {

       /*  Rewind the counter */

    stmt->read_row_func= stmt_read_row_buffered;

    stmt->state= MYSQL_STMT_EXECUTE_DONE;

  }

  DBUG_VOID_RETURN;

}

mysql-test/r/variables.result

+4 −0
Original line number Diff line number Diff line
@@ -478,3 +478,7 @@ t1 CREATE TABLE `t1` ( 
  `c3` longtext

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

SET GLOBAL MYISAM_DATA_POINTER_SIZE= 8;

SHOW VARIABLES LIKE 'MYISAM_DATA_POINTER_SIZE';

Variable_name	Value

myisam_data_pointer_size	8

mysql-test/t/variables.test

+7 −0
Original line number Diff line number Diff line
@@ -355,3 +355,10 @@ create table t1 as select @arg00 as c1, @arg01 as c2, @arg02 as c3; 
show create table t1;

drop table t1;





#

# Bug #6993: myisam_data_pointer_size

#



SET GLOBAL MYISAM_DATA_POINTER_SIZE= 8;

SHOW VARIABLES LIKE 'MYISAM_DATA_POINTER_SIZE';

ndb/include/logger/Logger.hpp

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public: 
  /** The log levels. NOTE: Could not use the name LogLevel since 

   * it caused conflicts with another class.

   */

  enum LoggerLevel {LL_OFF, LL_DEBUG, LL_INFO, LL_WARNING, LL_ERROR,

  enum LoggerLevel {LL_ON, LL_DEBUG, LL_INFO, LL_WARNING, LL_ERROR,

		    LL_CRITICAL, LL_ALERT, LL_ALL};

  

  /**