diff options
| author | Timothy Smith <timothy.smith@sun.com> | 2008-08-20 16:18:33 -0600 |
|---|---|---|
| committer | Timothy Smith <timothy.smith@sun.com> | 2008-08-20 16:18:33 -0600 |
| commit | d8aa83b270751f6d98d4bcb5d0ae42564350e4c3 (patch) | |
| tree | 7b36e428d5318b8a5aab2120ccd83b5a7746aaf4 /sql/sql_show.cc | |
| parent | 1999186d892ab5a542603e15b744a5110e1ea348 (diff) | |
| download | mariadb-git-d8aa83b270751f6d98d4bcb5d0ae42564350e4c3.tar.gz | |
Cherry-pick some changes from innodb-5.1-ss2545 snapshot. Includes fixes for
Bug#37531, Bug#36941, Bug#36941, Bug#36942, Bug#38185.
Also include test case from Bug 34300 which was left out from earlier snapshot
(5.1-ss2387).
Also include fix for Bug #29507, "TRUNCATE shows to many rows effected", since
the fix for Bug 37531 depends on it.
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 005eea06e2e..cc465db7720 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3549,8 +3549,7 @@ static int get_schema_tables_record(THD *thd, TABLE_LIST *tables, if(file) { - file->info(HA_STATUS_VARIABLE | HA_STATUS_TIME | HA_STATUS_AUTO | - HA_STATUS_NO_LOCK); + file->info(HA_STATUS_VARIABLE | HA_STATUS_TIME | HA_STATUS_AUTO); enum row_type row_type = file->get_row_type(); switch (row_type) { case ROW_TYPE_NOT_USED: |