diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-21 13:02:57 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2007-02-21 13:02:57 +0200 |
| commit | b9a609acd40451a1aede06a3837cbd28d74e9161 (patch) | |
| tree | a5373ac33cc100031b219da1e424961b585d3947 /mysql-test/t/ndb_lock.test | |
| parent | f3f82ef594901cc284d4e2f39667cff07cc9fa18 (diff) | |
| download | mariadb-git-b9a609acd40451a1aede06a3837cbd28d74e9161.tar.gz | |
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
include/my_global.h:
Fixed unsafe define of uint4korr()
mysql-test/lib/mtr_report.pl:
Removed wrong messages when using --extern
mysql-test/mysql-test-run.pl:
Fixed that --extern works
Print help on stdout instead of stderr (make it easier to pipe it to less)
mysql-test/t/ndb_lock.test:
Added other possible error code
sql/sql_prepare.cc:
Removed not needed casts
Diffstat (limited to 'mysql-test/t/ndb_lock.test')
| -rw-r--r-- | mysql-test/t/ndb_lock.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/ndb_lock.test b/mysql-test/t/ndb_lock.test index 8dc02dc20cb..bd35a7d28c3 100644 --- a/mysql-test/t/ndb_lock.test +++ b/mysql-test/t/ndb_lock.test @@ -149,7 +149,7 @@ begin; # Have to check with pk access here since scans take locks on # all rows and then release them in chunks select * from t1 where x = 1 for update; ---error 1205 +--error 1105,1205 select * from t1 where x = 2 for update; rollback; |