Manual merge

BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/olap.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962:
  Auto merged
BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19:
  Auto merged

17 files changed, 44 insertions, 14 deletions

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index eff53f4a789..ef063bd6ab7 100644
--- a/BitKeeper/etc/logging_ok
+++ b/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
diff --git a/man/mysql.1.in b/man/mysql.1.in
index 7330ac8125b..c4463aa658b 100644
--- a/man/mysql.1.in
+++ b/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
diff --git a/man/mysql_fix_privilege_tables.1.in b/man/mysql_fix_privilege_tables.1.in
index 1d42681f298..fe1016e8d98 100644
--- a/man/mysql_fix_privilege_tables.1.in
+++ b/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
diff --git a/man/mysql_zap.1.in b/man/mysql_zap.1.in
index 511a8feaa7c..fb030427dc2 100644
--- a/man/mysql_zap.1.in
+++ b/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 
diff --git a/man/mysqlaccess.1.in b/man/mysqlaccess.1.in
index cf2e0658a1c..e0b3d314a10 100644
--- a/man/mysqlaccess.1.in
+++ b/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
diff --git a/man/mysqladmin.1.in b/man/mysqladmin.1.in
index a549f1c0e22..e62cb32dc78 100644
--- a/man/mysqladmin.1.in
+++ b/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
diff --git a/man/mysqld.1.in b/man/mysqld.1.in
index 719711edca2..73f07337f25 100644
--- a/man/mysqld.1.in
+++ b/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
diff --git a/man/mysqld_multi.1.in b/man/mysqld_multi.1.in
index 26e7a091b60..58e5c71d01d 100644
--- a/man/mysqld_multi.1.in
+++ b/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.
 
diff --git a/man/mysqld_safe.1.in b/man/mysqld_safe.1.in
index 641f34677c7..5aabd232a11 100644
--- a/man/mysqld_safe.1.in
+++ b/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
diff --git a/man/mysqldump.1.in b/man/mysqldump.1.in
index 6d1cc80c837..4d841117e59 100644
--- a/man/mysqldump.1.in
+++ b/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
diff --git a/man/mysqlman.1.in b/man/mysqlman.1.in
index 610a64da198..b09b01ca759 100644
--- a/man/mysqlman.1.in
+++ b/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
diff --git a/man/mysqlshow.1.in b/man/mysqlshow.1.in
index 903d9620fd6..2db79ae070e 100644
--- a/man/mysqlshow.1.in
+++ b/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
diff --git a/man/perror.1.in b/man/perror.1.in
index f9efb48510b..45b343a9c3f 100644
--- a/man/perror.1.in
+++ b/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
diff --git a/man/replace.1.in b/man/replace.1.in
index 395411f7e9f..618ed0f5bea 100644
--- a/man/replace.1.in
+++ b/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 
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result
index b04cd6fd068..4863cb5b75e 100644
--- a/mysql-test/r/olap.result
+++ b/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;
diff --git a/mysql-test/t/olap.test b/mysql-test/t/olap.test
index 6778af3d533..3aac0f45ead 100644
--- a/mysql-test/t/olap.test
+++ b/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;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 2bb4cef1247..811ba863a76 100644
--- a/sql/sql_select.cc
+++ b/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++;