Commit 74959eed authored by tomas@whalegate.ndb.mysql.com's avatar tomas@whalegate.ndb.mysql.com
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
parents f4d6dd71 f8ade5e9

BitKeeper/triggers/post-commit

+9 −3
Original line number Diff line number Diff line 
#!/bin/sh



#shift

FROM=$USER@mysql.com

if [ -n "$BK_USER" ]

then

  COMMITTER=$BK_USER

else

  COMMITTER=$USER

fi

FROM=$COMMITTER@mysql.com

COMMITS=commits@lists.mysql.com

DOCS=docs-commit@mysql.com

LIMIT=10000
@@ -88,8 +94,8 @@ Subject: bk commit into $VERSION tree ($CHANGESET)$BS 
X-CSetKey: <$CSETKEY>

$BH

Below is the list of changes that have just been committed into a local

$VERSION repository of $USER. When $USER does a push these changes will

be propagated to the main repository and, within 24 hours after the

$VERSION repository of $COMMITTER.  When $COMMITTER does a push these changes

will be propagated to the main repository and, within 24 hours after the

push, to the public repository.

For information on how to access the public repository

see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

client/mysql.cc

+5 −4
Original line number Diff line number Diff line
@@ -1272,9 +1272,7 @@ static bool add_line(String &buffer,char *line,char *in_string, 
  if (status.add_to_history && line[0] && not_in_history(line))

    add_history(line);

#endif

#ifdef USE_MB

  char *end_of_line=line+(uint) strlen(line);

#endif



  for (pos=out=line ; (inchar= (uchar) *pos) ; pos++)

  {
@@ -1364,7 +1362,7 @@ static bool add_line(String &buffer,char *line,char *in_string, 
      }

    }

    else if (!*ml_comment && !*in_string &&

             strlen(pos) >= 10 &&

             (end_of_line - pos) >= 10 &&

             !my_strnncoll(charset_info, (uchar*) pos, 10,

                           (const uchar*) "delimiter ", 10))

    {
@@ -3085,7 +3083,10 @@ com_connect(String *buffer, char *line) 
      Two null bytes are needed in the end of buff to allow

      get_arg to find end of string the second time it's called.

    */

    strmake(buff, line, sizeof(buff)-2);

    tmp= strmake(buff, line, sizeof(buff)-2);

#ifdef EXTRA_DEBUG

    tmp[1]= 0;

#endif

    tmp= get_arg(buff, 0);

    if (tmp && *tmp)

    {

client/mysqltest.c

+2 −2
Original line number Diff line number Diff line
@@ -3592,7 +3592,7 @@ void do_get_file_name(struct st_command *command, 
  if (*p)

    *p++= 0;

  command->last_argument= p;

  strmake(dest, name, dest_max_len);

  strmake(dest, name, dest_max_len - 1);

}
@@ -6908,7 +6908,7 @@ int main(int argc, char **argv) 


	if (save_file[0])

	{

	  strmake(command->require_file, save_file, sizeof(save_file));

	  strmake(command->require_file, save_file, sizeof(save_file) - 1);

	  save_file[0]= 0;

	}

	run_query(cur_con, command, flags);

mysql-test/mysql-test-run.pl

+4 −8
Original line number Diff line number Diff line
@@ -481,13 +481,8 @@ sub command_line_setup () { 
  $opt_suite=        "main";    # Special default suite

  my $opt_comment;



  $opt_master_myport=          9306;

  $opt_slave_myport=           9308;

  $opt_ndbcluster_port=        9310;

  $opt_ndbcluster_port_slave=  9311;

  $im_port=                    9312;

  $im_mysqld1_port=            9313;

  $im_mysqld2_port=            9314;

  # Magic number -69.4 results in traditional test ports starting from 9306.

  set_mtr_build_thread_ports(-69.4);



  # If so requested, we try to avail ourselves of a unique build thread number.

  if ( $ENV{'MTR_BUILD_THREAD'} ) {
@@ -1322,6 +1317,7 @@ sub set_mtr_build_thread_ports($) { 
  }



  # Up to two masters, up to three slaves

  # A magic value in command_line_setup depends on these equations.

  $opt_master_myport=         $mtr_build_thread * 10 + 10000; # and 1

  $opt_slave_myport=          $opt_master_myport + 2;  # and 3 4

  $opt_ndbcluster_port=       $opt_master_myport + 5;

mysql-test/r/func_gconcat.result

+62 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ group_concat(distinct s1 order by s2) 
c,b,a

select group_concat(distinct s1 order by s2) from t1;

group_concat(distinct s1 order by s2)

c,b,a,c

c,b,a

drop table t1;

create table t1 (a int, c int);

insert into t1 values (1, 2), (2, 3), (2, 4), (3, 5);
@@ -870,4 +870,65 @@ select group_concat(f1) from t1; 
group_concat(f1)

,

drop table t1;

CREATE TABLE t1 (a INT, b INT);

INSERT INTO t1 VALUES (1, 1), (2, 2), (2, 3);

SELECT GROUP_CONCAT(DISTINCT a ORDER BY b) FROM t1;

GROUP_CONCAT(DISTINCT a ORDER BY b)

1,2

SELECT GROUP_CONCAT(DISTINCT a ORDER BY b DESC) FROM t1;

GROUP_CONCAT(DISTINCT a ORDER BY b DESC)

2,1

SELECT GROUP_CONCAT(DISTINCT a) FROM t1;

GROUP_CONCAT(DISTINCT a)

1,2

SELECT GROUP_CONCAT(DISTINCT a + 1 ORDER BY 3 - b) FROM t1;

GROUP_CONCAT(DISTINCT a + 1 ORDER BY 3 - b)

3,2

SELECT GROUP_CONCAT(DISTINCT a + 1 ORDER BY b) FROM t1;

GROUP_CONCAT(DISTINCT a + 1 ORDER BY b)

2,3

SELECT GROUP_CONCAT(a ORDER BY 3 - b) FROM t1;

GROUP_CONCAT(a ORDER BY 3 - b)

2,2,1

CREATE TABLE t2 (a INT, b INT, c INT, d INT);

INSERT INTO t2 VALUES (1,1, 1,1), (1,1, 2,2), (1,2, 2,1), (2,1, 1,2);

SELECT GROUP_CONCAT(DISTINCT a, b ORDER BY c, d) FROM t2;

GROUP_CONCAT(DISTINCT a, b ORDER BY c, d)

11,21,12

SELECT GROUP_CONCAT(DISTINCT a, b ORDER BY d, c) FROM t2;

GROUP_CONCAT(DISTINCT a, b ORDER BY d, c)

11,12,21

CREATE TABLE t3 (a INT, b INT, c INT);

INSERT INTO t3 VALUES (1, 1, 1), (2, 1, 2), (3, 2, 1);

SELECT GROUP_CONCAT(DISTINCT a, b ORDER BY b, c) FROM t3;

GROUP_CONCAT(DISTINCT a, b ORDER BY b, c)

11,21,32

SELECT GROUP_CONCAT(DISTINCT a, b ORDER BY c, b) FROM t3;

GROUP_CONCAT(DISTINCT a, b ORDER BY c, b)

11,32,21

SELECT GROUP_CONCAT(DISTINCT a, b ORDER BY a, b) FROM t1;

GROUP_CONCAT(DISTINCT a, b ORDER BY a, b)

11,22,23

SELECT GROUP_CONCAT(DISTINCT b, a ORDER BY a, b) FROM t1;

GROUP_CONCAT(DISTINCT b, a ORDER BY a, b)

11,22,32

SELECT GROUP_CONCAT(DISTINCT a, b ORDER BY b, a) FROM t1;

GROUP_CONCAT(DISTINCT a, b ORDER BY b, a)

11,22,23

SELECT GROUP_CONCAT(DISTINCT b, a ORDER BY a, b) FROM t1;

GROUP_CONCAT(DISTINCT b, a ORDER BY a, b)

11,22,32

SELECT GROUP_CONCAT(DISTINCT a ORDER BY a, b) FROM t1;

GROUP_CONCAT(DISTINCT a ORDER BY a, b)

1,2

SELECT GROUP_CONCAT(DISTINCT b ORDER BY b, a) FROM t1;

GROUP_CONCAT(DISTINCT b ORDER BY b, a)

1,2,3

SELECT GROUP_CONCAT(DISTINCT a, b ORDER BY a) FROM t1;

GROUP_CONCAT(DISTINCT a, b ORDER BY a)

11,23,22

SELECT GROUP_CONCAT(DISTINCT b, a ORDER BY b) FROM t1;

GROUP_CONCAT(DISTINCT b, a ORDER BY b)

11,22,32

DROP TABLE t1, t2, t3;

End of 5.0 tests