Manual merge

BitKeeper/etc/logging_ok

@@ -49,6 +49,7 @@ dlenev@jabberwock.localdomain
 dlenev@mysql.com
 ejonore@mc03.ndb.mysql.com
 gbichot@quadita2.mysql.com
+gbichot@quadxeon.mysql.com
 georg@beethoven.local
 georg@beethoven.site
 georg@lmy002.wdf.sap.corp

man/mysql.1.in

@@ -145,7 +145,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR

man/mysql_fix_privilege_tables.1.in

@@ -30,7 +30,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR

man/mysql_zap.1.in

@@ -44,7 +44,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR 

man/mysqlaccess.1.in

@@ -110,7 +110,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR

man/mysqladmin.1.in

@@ -194,7 +194,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR

man/mysqld.1.in

@@ -219,7 +219,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR

man/mysqld_multi.1.in

@@ -74,7 +74,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 

man/mysqld_safe.1.in

@@ -76,7 +76,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR

man/mysqldump.1.in

@@ -263,7 +263,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR

man/mysqlman.1.in

@@ -9,7 +9,7 @@ In most cases, you can run the executable from the command line with a "--help"
 argument to display a brief summary of the executable's arguments and function.
 For more information about MySQL, please refer to the MySQL reference manual,
 which may already be installed locally and which is also available online at
-http://dev.mysql.com/doc/
+http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .\" end of man page

man/mysqlshow.1.in

@@ -83,7 +83,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR

man/perror.1.in

@@ -43,7 +43,7 @@ replace(1)
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR

man/replace.1.in

@@ -57,7 +57,7 @@ perror(1),
 .P
 For more information please refer to the MySQL reference
 manual, which may already be installed locally and which
-is also available online at http://www.mysql.com/doc/en/
+is also available online at http://dev.mysql.com/doc/mysql/en
 .SH BUGS
 Please refer to http://bugs.mysql.com/ to report bugs.
 .SH AUTHOR 

mysql-test/r/olap.result

@@ -379,3 +379,16 @@ a	sum(b)
 4	4
 NULL	14
 DROP TABLE t1;
+CREATE TABLE t1 (a int, b int);
+INSERT INTO t1 VALUES
+(1,4),
+(2,2), (2,2),
+(4,1), (4,1), (4,1), (4,1),
+(2,1), (2,1);
+SELECT a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1;
+a	SUM(b)
+1	4
+SELECT SQL_CALC_FOUND_ROWS a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1;
+a	SUM(b)
+1	4
+DROP TABLE t1;

mysql-test/t/olap.test

@@ -155,3 +155,19 @@ SELECT DISTINCT a, sum(b) FROM t1 GROUP BY a,b WITH ROLLUP;
 
 DROP TABLE t1;
 
+#
+# Tests for bugs #8617: SQL_CACL_FOUND_ROWS with rollup and limit 
+#
+
+CREATE TABLE t1 (a int, b int);
+
+INSERT INTO t1 VALUES
+  (1,4),
+  (2,2), (2,2),
+  (4,1), (4,1), (4,1), (4,1),
+  (2,1), (2,1);
+
+SELECT a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1;
+SELECT SQL_CALC_FOUND_ROWS a, SUM(b) FROM t1 GROUP BY a WITH ROLLUP LIMIT 1;
+
+DROP TABLE t1;

sql/sql_select.cc

@@ -12736,7 +12736,7 @@ int JOIN::rollup_send_data(uint idx)
 	   ref_pointer_array_size);
     if ((!having || having->val_int()))
     {
-      if (send_records < unit->select_limit_cnt &&
+      if (send_records < unit->select_limit_cnt && do_send_rows &&
 	  result->send_data(rollup.fields[i]))
 	return 1;
       send_records++;