Commit c8b3d65c authored by unknown's avatar unknown
Browse files

Merge

parents 1a72e219 8e3addf9

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1052,3 +1052,4 @@ ndb/tools/ndb_drop_index.dsp 
ndb/tools/ndb_show_tables.dsp

ndb/tools/ndb_select_all.dsp

ndb/tools/ndb_select_count.dsp

support-files/ndb-config-2-node.ini

innobase/dict/dict0dict.c

+2 −1
Original line number Diff line number Diff line
@@ -2671,7 +2671,8 @@ dict_strip_comments( 
			/* Starting quote: remember the quote character. */

			quote = *sptr;

		} else if (*sptr == '#'

		    || (0 == memcmp("-- ", sptr, 3))) {

                           || (sptr[0] == '-' && sptr[1] == '-' &&

                               sptr[2] == ' ')) {

			for (;;) {

				/* In Unix a newline is 0x0A while in Windows

				it is 0x0D followed by 0x0A */

mysql-test/r/select_found.result

+1 −0
Original line number Diff line number Diff line
@@ -254,3 +254,4 @@ a 
SELECT FOUND_ROWS();

FOUND_ROWS()

1

DROP TABLE t1;

mysql-test/r/type_set.result

+18 −0
Original line number Diff line number Diff line
@@ -29,6 +29,12 @@ a 
A

a,A

a,A

select s from t1 order by concat(s);

s

A

a

a,A

a,A

drop table t1;

CREATE TABLE t1 (c set('ae','oe','ue','ss') collate latin1_german2_ci);

INSERT INTO t1 VALUES (''),(''),(''),('');
@@ -47,4 +53,16 @@ ss 
ss

ae,oe,ue,ss

ae,oe,ue,ss

SELECT c FROM t1 ORDER BY concat(c);

c

ae

ae

ae,oe,ue,ss

ae,oe,ue,ss

oe

oe

ss

ss

ue

ue

DROP TABLE t1;

mysql-test/t/select_found.test

+1 −0
Original line number Diff line number Diff line
@@ -175,3 +175,4 @@ CREATE TABLE t1 (a int, b int); 
INSERT INTO t1 VALUES (1,2), (1,3), (1,4), (1,5);

SELECT SQL_CALC_FOUND_ROWS DISTINCT 'a' FROM t1 GROUP BY b LIMIT 2;

SELECT FOUND_ROWS();

DROP TABLE t1;