diff options
author | unknown <monty@mysql.com> | 2004-04-08 13:58:06 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-04-08 13:58:06 +0300 |
commit | 16845a71aa333bd43522a90652c87dcd953f9191 (patch) | |
tree | a2db2fbae50b0568aeaf80c5eb2dbb8027359da4 /mysql-test | |
parent | 3cb13f7926334b6542d46d6a78c8aadeb1aefcc8 (diff) | |
download | mariadb-git-16845a71aa333bd43522a90652c87dcd953f9191.tar.gz |
Moved reading of ranges from opt_range.cc to handler.cc
This gives the handler more optimization possiblities and is needed for NDB cluster
Fixed not-initialized memory error detected by valgrind
mysql-test/mysql-test-run.sh:
Fixed address to manual page
mysql-test/r/gis-rtree.result:
Added test to show fatal error in GIS
mysql-test/r/grant.result:
New tests
mysql-test/t/gis-rtree.test:
New tests
mysql-test/t/grant.test:
New tests
sql/handler.cc:
Moved reading of ranges from opt_range.cc to handler.cc
This gives the handler more optimization possiblities and is needed for NDB cluster
sql/handler.h:
Moved reading of ranges from opt_range.cc to handler.cc
T
sql/opt_range.cc:
Moved reading of ranges from opt_range.cc to handler.cc
Simplified GIS get_next() handling
Indentation cleanups
sql/opt_range.h:
Removed not needed cmp_next()
Added new QUICK_SELECT method for GIS keys to make code for normal keys easier and faster
sql/sql_select.cc:
Fixed wrong handling of usable-keys in test_if_skip_sort_order (not fatal, just a warning from valgrind)
Added DBUG
Cleaned up comments
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/mysql-test-run.sh | 2 | ||||
-rw-r--r-- | mysql-test/r/gis-rtree.result | 7 | ||||
-rw-r--r-- | mysql-test/r/grant.result | 2 | ||||
-rw-r--r-- | mysql-test/t/gis-rtree.test | 13 | ||||
-rw-r--r-- | mysql-test/t/grant.test | 2 |
5 files changed, 25 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index d0ce62cdcee..96ac17755ac 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -670,7 +670,7 @@ report_stats () { $ECHO "The log files in $MY_LOG_DIR may give you some hint" $ECHO "of what when wrong." $ECHO "If you want to report this error, please read first the documentation at" - $ECHO "http://www.mysql.com/doc/M/y/MySQL_test_suite.html" + $ECHO "http://www.mysql.com/doc/en/MySQL_test_suite.html" fi if test -z "$USE_RUNNING_SERVER" diff --git a/mysql-test/r/gis-rtree.result b/mysql-test/r/gis-rtree.result index ab5338d383b..b66ef6d6a31 100644 --- a/mysql-test/r/gis-rtree.result +++ b/mysql-test/r/gis-rtree.result @@ -750,3 +750,10 @@ analyze table t1; Table Op Msg_type Msg_text test.t1 analyze status OK drop table t1; +CREATE TABLE t1 ( +fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, +g GEOMETRY NOT NULL, +SPATIAL KEY(g) +) ENGINE=MyISAM; +INSERT INTO t1 (g) VALUES (GeomFromText('LineString(1 2, 2 3)')),(GeomFromText('LineString(1 2, 2 4)')); +drop table t1; diff --git a/mysql-test/r/grant.result b/mysql-test/r/grant.result index 2c17373bd00..8b3948e093f 100644 --- a/mysql-test/r/grant.result +++ b/mysql-test/r/grant.result @@ -76,6 +76,8 @@ delete from mysql.db where user='mysqltest_1'; delete from mysql.tables_priv where user='mysqltest_1'; delete from mysql.columns_priv where user='mysqltest_1'; flush privileges; +show grants for mysqltest_1@localhost; +ERROR 42000: There is no such grant defined for user 'mysqltest_1' on host 'localhost' create table t1 (a int); GRANT select,update,insert on t1 to mysqltest_1@localhost; GRANT select (a), update (a),insert(a), references(a) on t1 to mysqltest_1@localhost; diff --git a/mysql-test/t/gis-rtree.test b/mysql-test/t/gis-rtree.test index 629a07a4913..8e91e5891b8 100644 --- a/mysql-test/t/gis-rtree.test +++ b/mysql-test/t/gis-rtree.test @@ -103,3 +103,16 @@ check table t1; analyze table t1; drop table t1; +# +# The following crashed gis +# + +CREATE TABLE t1 ( + fid INT NOT NULL AUTO_INCREMENT PRIMARY KEY, + g GEOMETRY NOT NULL, + SPATIAL KEY(g) +) ENGINE=MyISAM; + +INSERT INTO t1 (g) VALUES (GeomFromText('LineString(1 2, 2 3)')),(GeomFromText('LineString(1 2, 2 4)')); +#select * from t1 where g<GeomFromText('LineString(1 2, 2 3)'); +drop table t1; diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test index 326759cb9ca..832541b0f86 100644 --- a/mysql-test/t/grant.test +++ b/mysql-test/t/grant.test @@ -53,6 +53,8 @@ delete from mysql.db where user='mysqltest_1'; delete from mysql.tables_priv where user='mysqltest_1'; delete from mysql.columns_priv where user='mysqltest_1'; flush privileges; +--error 1141 +show grants for mysqltest_1@localhost; # # Test what happens when you have same table and colum level grants |