From 2275a161d0e6f016900468a8ed518c7568e1aa3c Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 27 Jan 2003 15:37:05 +0100 Subject: [PATCH] select count(*) from t1 procedure analyse(); bug fixed --- mysql-test/r/analyse.result | 2 +- sql/sql_select.cc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/analyse.result b/mysql-test/r/analyse.result index 0cb33526457..48882f42219 100644 --- a/mysql-test/r/analyse.result +++ b/mysql-test/r/analyse.result @@ -3,7 +3,7 @@ create table t1 (i int, j int); insert into t1 values (1,2), (3,4), (5,6), (7,8); select count(*) from t1 procedure analyse(); Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype - -6510615555426900571 -6510615555426900571 -6510615555426900571 -6510615555426900571 +count(*) 4 4 1 1 0 0 4.0000 0.0000 ENUM('4') NOT NULL select * from t1 procedure analyse(); Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_value_or_avg_length Std Optimal_fieldtype t1.i 1 7 1 1 0 0 4.0000 2.2361 ENUM('1','3','5','7') NOT NULL diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 4de4b2299f2..e554ac1d560 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -732,7 +732,9 @@ JOIN::exec() result->send_fields(fields_list,1); if (!having || having->val_int()) { - if (do_send_rows && result->send_data(fields_list)) + if (do_send_rows && (procedure ? (procedure->send_row(fields_list) || + procedure->end_of_records()) + : result->send_data(fields_list))) error= 1; else {