From 0f9725ad1fb99385ab0d184cf0851670fee37bbe Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 27 Jun 2006 20:10:49 -0400 Subject: Bug#16180 Setting SQL_LOG_OFF without SUPER privilege is silently ignored mysql-test/r/grant2.result: Added results for bug#16180 mysql-test/t/grant2.test: Added test for bug# 16180 sql/set_var.cc: Verify user has appropiate rights before setting the sql_log_off system variable. --- mysql-test/t/grant2.test | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'mysql-test/t') diff --git a/mysql-test/t/grant2.test b/mysql-test/t/grant2.test index 79ea7f70712..9da95cd42da 100644 --- a/mysql-test/t/grant2.test +++ b/mysql-test/t/grant2.test @@ -238,5 +238,22 @@ connect (con9,127.0.0.1,root,,test,$MASTER_MYPORT,); disconnect con9; connection default; +# +# Bug# 16180 - Setting SQL_LOG_OFF without SUPER privilege is silently ignored +# +create database mysqltest_1; +grant select, insert, update on `mysqltest\_1`.* to mysqltest_1@localhost; +connect (con10,localhost,mysqltest_1,,); +connection con10; +--error 1227 +set sql_log_off = 1; +--error 1227 +set sql_log_bin = 0; +disconnect con10; +connection default; +delete from mysql.user where user like 'mysqltest\_1'; +delete from mysql.db where user like 'mysqltest\_1'; +drop database mysqltest_1; +flush privileges; # End of 4.1 tests -- cgit v1.2.1 From f26639c9f261361df3215a19d4e19e4b9070f84e Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 29 Jun 2006 17:06:28 -0400 Subject: Bug#20328 mysql client: dumb about trailing spaces on help command. client/mysql.cc: Remove trailing spaces from help arguments in com_server_help. Disregard trailing spaces from command in com_help. mysql-test/r/mysql_client.result: Test trailing spaces on the help command. mysql-test/t/mysql_client.test: Result trailing spaces on the help command. --- mysql-test/t/mysql_client.test | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 mysql-test/t/mysql_client.test (limited to 'mysql-test/t') diff --git a/mysql-test/t/mysql_client.test b/mysql-test/t/mysql_client.test new file mode 100644 index 00000000000..6ae4717de9c --- /dev/null +++ b/mysql-test/t/mysql_client.test @@ -0,0 +1,9 @@ +# This test should work in embedded server after we fix mysqltest +-- source include/not_embedded.inc + +# +# Bug #20328: mysql client interprets commands in comments +# +--exec echo 'help' | $MYSQL +--exec echo 'help ' | $MYSQL + -- cgit v1.2.1 From f794dc3aa1897961b916e74c9f9169ea69e47bfd Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 19 Jul 2006 17:39:53 -0400 Subject: Manual merge required. mysql-test/r/mysql_client.result: manual merge mysql-test/t/mysql_client.test: manual merge --- mysql-test/t/mysql_client.test | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'mysql-test/t') diff --git a/mysql-test/t/mysql_client.test b/mysql-test/t/mysql_client.test index e4b6658b631..9cdf5aea64b 100644 --- a/mysql-test/t/mysql_client.test +++ b/mysql-test/t/mysql_client.test @@ -27,3 +27,9 @@ # client comment recognized, but parameter missing => error --exec echo "use" > $MYSQLTEST_VARDIR/tmp/bug20432.sql --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug20432.sql 2>&1 + +# +# Bug #20328: mysql client interprets commands in comments +# +--exec echo 'help' | $MYSQL +--exec echo 'help ' | $MYSQL -- cgit v1.2.1 From f4fb48bab0c61a769cd7efabfba41e0ca672abcd Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 2 Aug 2006 13:06:59 -0400 Subject: Bug#9719: DELETE with WHERE on HEAP table just deletes first row of matched set. (Ramil's patch, recreated.) heap/hp_delete.c: Reset info->lastkey_len for further heap_rnext/heap_rprev calls. mysql-test/r/heap_btree.result: Test for bug #9719: DELETE with WHERE on HEAP table just deletes first row of matched set. mysql-test/t/heap_btree.test: Test for bug #9719: DELETE with WHERE on HEAP table just deletes first row of matched set. --- mysql-test/t/heap_btree.test | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'mysql-test/t') diff --git a/mysql-test/t/heap_btree.test b/mysql-test/t/heap_btree.test index aea9e9486e5..f510f97fe9b 100644 --- a/mysql-test/t/heap_btree.test +++ b/mysql-test/t/heap_btree.test @@ -164,4 +164,22 @@ DELETE from t1 where a < 100; SELECT * from t1; DROP TABLE t1; -# End of 4.1 tests +# +# Bug #9719: problem with delete +# + +create table t1(a int not null, key using btree(a)) engine=heap; +insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3); +select a from t1 where a > 2; +delete from t1 where a < 4; +select a from t1; +insert into t1 values (2), (2), (2), (1), (1), (3), (3), (3), (3); +select a from t1 where a > 4; +delete from t1 where a > 4; +select a from t1; +select a from t1 where a > 3; +delete from t1 where a >= 2; +select a from t1; +drop table t1; + +--echo End of 4.1 tests -- cgit v1.2.1