database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

after merge fixes

Browse Source 
mysql-test/r/fulltext.result:
  after merge - test results updated
sql/sql_class.cc:
  protection
This commit is contained in:
unknown
2005-03-09 19:22:30 +01:00
parent cd4961830e
commit d1b3c64b23
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/fulltext.result
View File

@@ -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

6
mysys/my_bitmap.c
View File

@@ -28,8 +28,8 @@
* when both arguments are bitmaps, they must be of the same size
* bitmap_intersect() is an exception :)
(for for Bitmap::intersect(ulonglong map2buff))
If THREAD is defined all bitmap operations except bitmap_init/bitmap_free
If THREAD is defined all bitmap operations except bitmap_init/bitmap_free
are thread-safe.
TODO:
@@ -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)

2
sql/ha_heap.cc
View File

@@ -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++)
{

4
sql/mysqld.cc
View File

@@ -1462,8 +1462,8 @@ void close_connection(THD *thd, uint errcode, bool lock)
errcode ? ER(errcode) : ""));
if (lock)
(void) pthread_mutex_lock(&LOCK_thread_count);
thd->killed=1;
if ((vio=thd->net.vio) != 0)
thd->killed= THD::KILL_CONNECTION;
if ((vio= thd->net.vio) != 0)
{
if (errcode)
net_send_error(thd, errcode, ER(errcode)); /* purecov: inspected */

4
sql/protocol.cc
View File

@@ -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

6
sql/sql_class.cc
View File

@@ -1781,7 +1781,11 @@ void TMP_TABLE_PARAM::init()
void thd_increment_bytes_sent(ulong length)
{
current_thd->status_var.bytes_sent+= length;
THD *thd=current_thd;
if (likely(thd))
{ /* current_thd==0 when close_connection() calls net_send_error() */
thd->status_var.bytes_sent+= length;
}
}