database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-03 05:41:09 +03:00
Code Activity

Merge.

Browse Source
This commit is contained in:
Igor Babaev
2011-07-21 15:55:08 -07:00
parent 813aaac51d 63abf00a62
commit 2092436457
42 changed files with 710 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/innodb_plugin/r/innodb_lock_wait_timeout_1.result
View File

@@ -104,7 +104,7 @@ id 1
select_type PRIMARY
table <derived2>
type ALL
possible_keys key0
possible_keys NULL
key NULL
key_len NULL
ref NULL
@@ -308,7 +308,7 @@ id 1
select_type PRIMARY
table <derived2>
type ALL
possible_keys key0
possible_keys NULL
key NULL
key_len NULL
ref NULL