Commit 3cfdd984 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

merge

parents ce1353a4 b716c181
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -49850,6 +49850,8 @@ not yet 100% confident in this code.
@appendixsubsec Changes in release 3.23.51
@itemize @bullet
@item
Fixed bug in @code{CONCAT_WS()} that cut the result.
@item
Changed name of variables @code{Com_show_master_stat} to
@code{Com_show_master_status} and @code{Com_show_slave_stat} to
@code{Com_show_slave_status}.
+13 −0
Original line number Diff line number Diff line
number	alpha	new
1413006	idlfmv	1413006<---->idlfmv
1413065	smpsfz	1413065<---->smpsfz
1413127	sljrhx	1413127<---->sljrhx
1413304	qerfnd	1413304<---->qerfnd
new
1413006<---->idlfmv
number	alpha	new
1413006	idlfmv	1413006<->idlfmv
number	alpha	new
1413006	idlfmv	1413006-idlfmv-idlfmv-idlfmv-idlfmv-idlfmv-idlfmv-idlfmv
number	alpha	new
1413006	idlfmv	1413006<------------------>idlfmv
+24 −0
Original line number Diff line number Diff line
#
# Test of problem with CONCAT_WS() and long separators.
#

DROP TABLE IF EXISTS t1;
CREATE TABLE t1 ( number INT NOT NULL, alpha CHAR(6) NOT NULL );
INSERT INTO t1 VALUES (1413006,'idlfmv'),
(1413065,'smpsfz'),(1413127,'sljrhx'),(1413304,'qerfnd');

SELECT number, alpha, CONCAT_WS('<---->',number,alpha) AS new
FROM t1 GROUP BY number;

SELECT CONCAT_WS('<---->',number,alpha) AS new
FROM t1 GROUP BY new LIMIT 1;

SELECT number, alpha, CONCAT_WS('<->',number,alpha) AS new
FROM t1 GROUP BY new LIMIT 1;

SELECT number, alpha, CONCAT_WS('-',number,alpha,alpha,alpha,alpha,alpha,alpha,alpha) AS new
FROM t1 GROUP BY new LIMIT 1;

SELECT number, alpha, CONCAT_WS('<------------------>',number,alpha) AS new
FROM t1 GROUP BY new LIMIT 1;
drop table t1;
+1 −0
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
}
#endif


#ifdef HPUX
int my_pthread_mutex_trylock(pthread_mutex_t *mutex)
{
+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ String *Item_func_concat_ws::val_str(String *str)

void Item_func_concat_ws::fix_length_and_dec()
{
  max_length=0;
  max_length=separator->max_length*(arg_count-1);
  for (uint i=0 ; i < arg_count ; i++)
    max_length+=args[i]->max_length;
  if (max_length > MAX_BLOB_WIDTH)
Loading