mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor fixes

Browse source 
libmysqld/lib_sql.cc:
  Working when LIMIT is on
sql/sql_handler.cc:
  Usual fix to handle embedded case properly
sql/sql_select.cc:
  Usual fix to handle embedded case properly
sql/sql_table.cc:
  Usual fix to handle embedded case properly
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
This commit is contained in:
unknown 2002-07-09 10:39:22 +05:00
parent 9b76862b7f
commit 615c1e4fcf
5 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View file

@ -69,3 +69,4 @@ venu@work.mysql.com
worm@altair.is.lan
zak@balfor.local
zak@linux.local
hf@bisonxp.(none)

6
libmysqld/lib_sql.cc
View file

@ -813,6 +813,12 @@ bool select_send::send_data(List<Item> &items)
DBUG_ENTER("send_data");
if (unit->offset_limit_cnt)
{ // using limit offset,count
unit->offset_limit_cnt--;
DBUG_RETURN(0);
}
thd->packet.length(0);
while ((item=li++))
{

2
sql/sql_handler.cc
View file

@ -232,7 +232,7 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
goto err;
}
}
my_net_write(&thd->net, (char*)packet->ptr(), packet->length());
SEND_ROW(thd, &thd->net, list.elements, (char*)packet->ptr(), packet->length());
}
}
num_rows++;

2
sql/sql_select.cc
View file

@ -7309,6 +7309,6 @@ static void describe_info(THD *thd, const char *info)
return; /* purecov: inspected */
packet->length(0);
net_store_data(packet,info);
if (!my_net_write(&thd->net,(char*) packet->ptr(),packet->length()))
if (!SEND_ROW(thd, &thd->net, field_list.elements, (char*) packet->ptr(),packet->length()))
send_eof(&thd->net);
}

4
sql/sql_table.cc
View file

@ -1101,7 +1101,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
err_msg=ER(ER_CHECK_NO_SUCH_TABLE);
net_store_data(packet, err_msg);
thd->net.last_error[0]=0;
if (my_net_write(&thd->net, (char*) thd->packet.ptr(),
if (SEND_ROW(thd, &thd->net, field_list.elements, (char*) thd->packet.ptr(),
packet->length()))
goto err;
continue;
@ -1116,7 +1116,7 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
net_store_data(packet, buff);
close_thread_tables(thd);
table->table=0; // For query cache
if (my_net_write(&thd->net, (char*) thd->packet.ptr(),
if (SEND_ROW(thd, &thd->net, field_list.elements, (char*) thd->packet.ptr(),
packet->length()))
goto err;
continue;