Merge stella.local:/home2/mydev/mysql-5.0-amain

into  stella.local:/home2/mydev/mysql-5.0-axmrg

mysql-test/include/gis_keys.inc

@@ -13,20 +13,20 @@ CREATE TABLE t2 (p POINT, INDEX(p));
 INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)'));
 INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)'));
 
--- no index, returns 1 as expected
+# no index, returns 1 as expected
 SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');
 
--- with index, returns 1 as expected
--- EXPLAIN shows that the index is not used though
--- due to the "most rows covered anyway, so a scan is more effective" rule
+# with index, returns 1 as expected
+# EXPLAIN shows that the index is not used though
+# due to the "most rows covered anyway, so a scan is more effective" rule
 EXPLAIN 
 SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');
 SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');
 
--- adding another row to the table so that
--- the "most rows covered" rule doesn't kick in anymore
--- now EXPLAIN shows the index used on the table
+# adding another row to the table so that
+# the "most rows covered" rule doesn't kick in anymore
+# now EXPLAIN shows the index used on the table
+# and we're getting the wrong result again
 INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)'));
 INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)'));
 EXPLAIN 

mysql-test/t/variables.test

@@ -139,7 +139,7 @@ show global variables like 'net_%';
 show session variables like 'net_%';
 set net_buffer_length=1;
 show variables like 'net_buffer_length';
---warning 1292
+#warning 1292
 set net_buffer_length=2000000000;
 show variables like 'net_buffer_length';