Commit d1b3c64b authored by unknown's avatar unknown
Browse files

after merge fixes 


mysql-test/r/fulltext.result:
  after merge - test results updated
sql/sql_class.cc:
  protection
parent cd496183

mysql-test/r/fulltext.result

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ a b 
MySQL has now support	for full-text search

select * from t1 where MATCH a,b AGAINST ('"now   support"' IN BOOLEAN MODE);

a	b

MySQL has now support	for full-text search

select * from t1 where MATCH a,b AGAINST ('"text search"  "now support"' IN BOOLEAN MODE);

a	b

MySQL has now support	for full-text search

mysys/my_bitmap.c

+4 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <my_bitmap.h>

#include <m_string.h>



static inline void bitmap_lock(MY_BITMAP *map)

{

#ifdef THREAD

  if (map->mutex)
@@ -47,6 +48,7 @@ 
#endif

}



static inline void bitmap_unlock(MY_BITMAP *map)

{

#ifdef THREAD

  if (map->mutex)

sql/ha_heap.cc

+0 −2
Original line number Diff line number Diff line
@@ -489,8 +489,6 @@ int ha_heap::create(const char *name, TABLE *table_arg, 
    default:

      DBUG_ASSERT(0); // cannot happen

    }

    keydef[key].algorithm= ((pos->algorithm == HA_KEY_ALG_UNDEF) ?

			    HA_KEY_ALG_HASH : pos->algorithm);



    for (; key_part != key_part_end; key_part++, seg++)

    {

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -1462,7 +1462,7 @@ void close_connection(THD *thd, uint errcode, bool lock) 
		      errcode ? ER(errcode) : ""));

  if (lock)

    (void) pthread_mutex_lock(&LOCK_thread_count);

  thd->killed=1;

  thd->killed= THD::KILL_CONNECTION;

  if ((vio= thd->net.vio) != 0)

  {

    if (errcode)

sql/protocol.cc

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ void net_send_error(THD *thd, uint sql_errno, const char *err) 
  char buff[MYSQL_ERRMSG_SIZE+2], *pos;

#endif

  NET *net= &thd->net;

  bool generate_warning= 1;

  bool generate_warning= thd->killed != THD::KILL_CONNECTION;

  DBUG_ENTER("net_send_error");

  DBUG_PRINT("enter",("sql_errno: %d  err: %s", sql_errno,

		      err ? err : net->last_error[0] ?
@@ -252,7 +252,7 @@ net_printf_error(THD *thd, uint errcode, ...) 
  strmake(net->last_error, text_pos, length);

  strmake(net->sqlstate, mysql_errno_to_sqlstate(errcode), SQLSTATE_LENGTH);

#endif

  if (!thd->killed)

  if (thd->killed != THD::KILL_CONNECTION)

    push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, errcode,

                 text_pos ? text_pos : ER(errcode));

  thd->is_fatal_error=0;			// Error message is given