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

Re-application of earlier patch for create_where_from_key and and delete_all_rows

Browse Source
This commit is contained in:
patg@krsna.patg.net
2005-10-18 15:54:50 -07:00
parent 2fc14efff1
commit 85f12e97c8
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/ha_federated.cc
View File

@@ -1169,6 +1169,7 @@ bool ha_federated::create_where_from_key(String *to,
switch(ranges[i]->flag) { switch(ranges[i]->flag) {
case(HA_READ_KEY_EXACT): case(HA_READ_KEY_EXACT):
DBUG_PRINT("info", ("federated HA_READ_KEY_EXACT %d", i));
if (store_length >= length || if (store_length >= length ||
!needs_quotes || !needs_quotes ||
key_part->type == HA_KEYTYPE_BIT || key_part->type == HA_KEYTYPE_BIT ||
@@ -1203,6 +1204,7 @@ bool ha_federated::create_where_from_key(String *to,
} }
break; break;
case(HA_READ_AFTER_KEY): case(HA_READ_AFTER_KEY):
DBUG_PRINT("info", ("federated HA_READ_AFTER_KEY %d", i));
if (store_length >= length) /* end key */ if (store_length >= length) /* end key */
{ {
if (emit_key_part_name(&tmp, key_part)) if (emit_key_part_name(&tmp, key_part))
@@ -1227,6 +1229,7 @@ bool ha_federated::create_where_from_key(String *to,
break; break;
} }
case(HA_READ_KEY_OR_NEXT): case(HA_READ_KEY_OR_NEXT):
DBUG_PRINT("info", ("federated HA_READ_KEY_OR_NEXT %d", i));
if (emit_key_part_name(&tmp, key_part) || if (emit_key_part_name(&tmp, key_part) ||
tmp.append(FEDERATED_GE) || tmp.append(FEDERATED_GE) ||
emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr, emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
@@ -1234,6 +1237,7 @@ bool ha_federated::create_where_from_key(String *to,
DBUG_RETURN(1); DBUG_RETURN(1);
break; break;
case(HA_READ_BEFORE_KEY): case(HA_READ_BEFORE_KEY):
DBUG_PRINT("info", ("federated HA_READ_BEFORE_KEY %d", i));
if (store_length >= length) if (store_length >= length)
{ {
if (emit_key_part_name(&tmp, key_part) || if (emit_key_part_name(&tmp, key_part) ||
@@ -1244,6 +1248,7 @@ bool ha_federated::create_where_from_key(String *to,
break; break;
} }
case(HA_READ_KEY_OR_PREV): case(HA_READ_KEY_OR_PREV):
DBUG_PRINT("info", ("federated HA_READ_KEY_OR_PREV %d", i));
if (emit_key_part_name(&tmp, key_part) || if (emit_key_part_name(&tmp, key_part) ||
tmp.append(FEDERATED_LE) || tmp.append(FEDERATED_LE) ||
emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr, emit_key_part_element(&tmp, key_part, needs_quotes, 0, ptr,
@@ -2509,11 +2514,12 @@ int ha_federated::delete_all_rows()
/* /*
TRUNCATE won't return anything in mysql_affected_rows TRUNCATE won't return anything in mysql_affected_rows
*/ */
deleted+= records;
if (mysql_real_query(mysql, query.ptr(), query.length())) if (mysql_real_query(mysql, query.ptr(), query.length()))
{ {
DBUG_RETURN(stash_remote_error()); DBUG_RETURN(stash_remote_error());
} }
deleted+= records;
records= 0;
DBUG_RETURN(0); DBUG_RETURN(0);
} }