diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-08-20 22:54:15 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-08-20 22:54:15 +0300 |
| commit | 75e8ce6d7316900e3b9431e9d50889fe00d2928c (patch) | |
| tree | 329b91b3158987576db3ab2173b156fd63ed95e9 /support-files | |
| parent | ee27b50ff8d8a80ca15cb33b4a8a0ed39aad772d (diff) | |
| download | mariadb-git-75e8ce6d7316900e3b9431e9d50889fe00d2928c.tar.gz | |
Ensure we don't assert with debug binaries if SHOW INNODB STATUS returns with an error.
sql/handler.cc:
SHOW INNODB STATUS sometimes returns 0 even if it has generated an error.
This code is here to catch it until InnoDB some day is fixed.
storage/innobase/handler/ha_innodb.cc:
Catch at least one of the possible errors from SHOW INNODB STATUS to provide a correct return code.
storage/xtradb/handler/ha_innodb.cc:
Catch at least one of the possible errors from SHOW INNODB STATUS to provide a correct return code.
support-files/my-huge.cnf.sh:
Fixed typo
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/my-huge.cnf.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/my-huge.cnf.sh b/support-files/my-huge.cnf.sh index 896b139273b..4e083488285 100644 --- a/support-files/my-huge.cnf.sh +++ b/support-files/my-huge.cnf.sh @@ -121,7 +121,7 @@ server-id = 1 # Uncomment the following if you are using InnoDB tables #innodb_data_home_dir = @localstatedir@ #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend -o#innodb_log_group_home_dir = @localstatedir@ +#innodb_log_group_home_dir = @localstatedir@ # You can set .._buffer_pool_size up to 50 - 80 % # of RAM but beware of setting memory usage too high #innodb_buffer_pool_size = 384M |