Commit 3634cce7 authored by unknown's avatar unknown
Browse files

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/ha/ha0ha.c:
  Auto merged
storage/innobase/include/hash0hash.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged
configure.in:
  Use local
sql/sql_parse.cc:
  Use local
sql/sql_table.cc:
  Use local
mysql-test/t/ps.test:
  SCCS merged
parents 7017cb07 f71b6a84

mysql-test/r/select.result

+6 −0
Original line number Diff line number Diff line
@@ -3611,3 +3611,9 @@ id select_type table type possible_keys key key_len ref rows Extra 
1	SIMPLE	t2	range	si,ai	si	5	NULL	2	Using where

1	SIMPLE	t3	eq_ref	PRIMARY,ci	PRIMARY	4	test.t2.a	1	Using where

DROP TABLE t1,t2,t3;

DROP TABLE IF EXISTS t1;

CREATE TABLE t1(a int);

INSERT into t1 values (1), (2), (3);

SELECT * FROM t1 LIMIT 2, -1;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '-1' at line 1

DROP TABLE t1;

mysql-test/t/select.test

+20 −0
Original line number Diff line number Diff line
@@ -3093,3 +3093,23 @@ SELECT t3.a FROM t1,t2,t3 
        t3.c IN ('bb','ee');



DROP TABLE t1,t2,t3;



#

# Bug#6298: LIMIT #, -1 no longer works to set start with no end limit

#



--disable_warnings

DROP TABLE IF EXISTS t1;

--enable_warnings



CREATE TABLE t1(a int);

INSERT into t1 values (1), (2), (3);



# LIMIT N, -1 was accepted by accident in 4.0, but was not intended.

# This test verifies that this illegal construct is now properly detected.



--error ER_PARSE_ERROR

SELECT * FROM t1 LIMIT 2, -1;



DROP TABLE t1;