diff options
| author | unknown <monty@mishka.local> | 2005-08-20 11:00:00 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.local> | 2005-08-20 11:00:00 +0300 |
| commit | 3eda70b270e2d24e6b4bd6662ddc0b2172b47b67 (patch) | |
| tree | 499bcf518b69b974792bbb607094965a41e25061 /mysql-test | |
| parent | 4d2bf4befcf6a91978c60b9a402301e864ed999e (diff) | |
| download | mariadb-git-3eda70b270e2d24e6b4bd6662ddc0b2172b47b67.tar.gz | |
Fixes during review of new pushed code
Fixed new bug when running a SP without a default database
mysql-test/r/information_schema.result:
Added test to cover changes made in default handling
mysql-test/r/sp-security.result:
Added test when executing SP without a default database
mysql-test/t/information_schema.test:
Added test to cover changes made in default handling
mysql-test/t/sp-security.test:
Added test when executing SP without a default database
sql/item_strfunc.cc:
Removed wrong push
sql/mysqld.cc:
Indentation fix
sql/sql_base.cc:
Use share->db instead of share->table_cache_key
Remove assert that can never fail (because of test in previous row)
sql/sql_db.cc:
Allow empty database name when called from SP
(To allow on run without a default database)
sql/sql_parse.cc:
Added comment
sql/sql_show.cc:
Indentation fixes
Simplified code by checking for 'wrong' condition first and doing continue instead of going down one level
Simplified precision and decimal handling
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/information_schema.result | 4 | ||||
| -rw-r--r-- | mysql-test/r/sp-security.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/information_schema.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/sp-security.test | 6 |
4 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 64e2434521e..7ec2fcdd453 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -966,4 +966,8 @@ column_name column_default a NULL b NULL use test; +show columns from t1; +Field Type Null Key Default Extra +a int(11) NO +b int(11) YES NULL drop table t1; diff --git a/mysql-test/r/sp-security.result b/mysql-test/r/sp-security.result index d78f5fc36ea..eb2e2ce334e 100644 --- a/mysql-test/r/sp-security.result +++ b/mysql-test/r/sp-security.result @@ -245,6 +245,8 @@ end// grant usage on *.* to mysqltest_1@localhost; call mysqltest_1.p1(); ERROR 42000: execute command denied to user 'mysqltest_1'@'localhost' for routine 'mysqltest_1.p1' +call mysqltest_1.p1(); +ERROR 42000: execute command denied to user 'mysqltest_1'@'localhost' for routine 'mysqltest_1.p1' drop procedure mysqltest_1.p1; drop database mysqltest_1; revoke usage on *.* from mysqltest_1@localhost; diff --git a/mysql-test/t/information_schema.test b/mysql-test/t/information_schema.test index 03810447299..04d53828035 100644 --- a/mysql-test/t/information_schema.test +++ b/mysql-test/t/information_schema.test @@ -649,4 +649,5 @@ use information_schema; select column_name, column_default from columns where table_schema='test' and table_name='t1'; use test; +show columns from t1; drop table t1; diff --git a/mysql-test/t/sp-security.test b/mysql-test/t/sp-security.test index c7c7ef20a5b..6f1332f80d5 100644 --- a/mysql-test/t/sp-security.test +++ b/mysql-test/t/sp-security.test @@ -397,6 +397,12 @@ connection n1; --error 1370 call mysqltest_1.p1(); disconnect n1; +# Test also without a current database +connect (n2,localhost,mysqltest_1,,*NO-ONE*,$MASTER_MYPORT,$MASTER_MYSOCK); +connection n2; +--error 1370 +call mysqltest_1.p1(); +disconnect n2; connection default; |