Commit d0722d73 authored by monty@donna.mysql.fi's avatar monty@donna.mysql.fi
Browse files

Added fix for using variables with distinct

parent 1bd0d416

Docs/manual.texi

+5 −0
Original line number Diff line number Diff line
@@ -2459,6 +2459,9 @@ A Windows GUI client by David Ecker. 
Kiosk; a @strong{MySQL} client for database management. Written in Perl.

Will be a part of Bazaar.













@item @uref{http://www.casestudio.com/}













Db design tool that supports MySQL 3.23.



























@item @uref{http://home.skif.net/~voland/zeos/eng/index.html}@*















Zeos - A client that supports @strong{MySQL}, Interbase and PostgreSQL.
























@@ -42152,6 +42155,8 @@ Fixed newly introduce bug in @code{ORDER BY}.













Fixed wrong define @code{CLIENT_TRANSACTIONS}.















@item















Fixed bug in @code{SHOW VARIABLES} when using INNOBASE tables.













@item













Setting and using user variables in @code{SELECT DISTINCT} didn't work.















@end itemize





























@node News-3.23.34a, News-3.23.34, News-3.23.35, News-3.23.x

























client/mysqltest.c



+6
−1






























Original line number
Diff line number
Diff line








@@ -43,7 +43,7 @@





























**********************************************************************/





























#define MTEST_VERSION "1.6"













#define MTEST_VERSION "1.7"































#include <global.h>















#include <my_sys.h>










@@ -156,6 +156,7 @@ struct st_query













         Q_SYNC_WITH_MASTER, Q_ERROR, 















         Q_SEND,             Q_REAP, 















         Q_DIRTY_CLOSE,      Q_REPLACE,













	 Q_PING,















         Q_UNKNOWN,                             /* Unknown command.   */















         Q_COMMENT,                             /* Comments, ignored. */















         Q_COMMENT_WITH_COMMAND









@@ -174,6 +175,7 @@ const char *command_names[] = {













  "sync_with_master", "error",















  "send",             "reap", 















  "dirty_close",      "replace_result",













  "ping",















  0















};


























@@ -1662,6 +1664,9 @@ int main(int argc, char** argv)













      case Q_SYNC_WITH_MASTER: do_sync_with_master(q); break;	















      case Q_COMMENT:				/* Ignore row */















      case Q_COMMENT_WITH_COMMAND:













      case Q_PING:













	(void) mysql_ping(&cur_con->mysql);













	break;















      default: processed = 0; break;















      }















    }

































configure.in



+1
−1






























Original line number
Diff line number
Diff line








@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.













AC_INIT(sql/mysqld.cc)















AC_CANONICAL_SYSTEM















# The Docs Makefile.am parses this line!













AM_INIT_AUTOMAKE(mysql, 3.23.34a)













AM_INIT_AUTOMAKE(mysql, 3.23.35)















AM_CONFIG_HEADER(config.h)































PROTOCOL_VERSION=10

































mysql-test/r/user_var.result



+6
−0






























Original line number
Diff line number
Diff line















@a - connection_id()















3













i













1













2













i	@vv1:=if(sv1.i,1,0)	@vv2:=if(sv2.i,1,0)	@vv3:=if(sv3.i,1,0)	@vv1+@vv2+@vv3













1	1	0	1	2













2	1	0	0	1
























mysql-test/t/kill.test



+11
−8






























Original line number
Diff line number
Diff line








@@ -3,21 +3,24 @@ connect (con2, localhost, root,,test,0, mysql-master.sock);





























#remember id of con1















connection con1;













drop table if exists connection_kill;













create table connection_kill (kill_id int);













insert into connection_kill values(connection_id());













drop table if exists t1;













create table t1 (kill_id int);













insert into t1 values(connection_id());































#kill con1















connection con2;













select ((@id := kill_id) - kill_id) from connection_kill; 













select ((@id := kill_id) - kill_id) from t1; 















kill @id;





























# verify that con1 is really dead













# Wait for thread to do.













--sleep 5













# verify that con1 is doning a reconnect















connection con1;













error 2013;













select 1;













ping













ping













select @id != connection_id();































#make sure the server is still alive















connection con2;















select 4;













drop table connection_kill;












drop table t1;