diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-11-12 18:08:12 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-11-12 18:08:12 +0100 |
| commit | 557f0d3ad04111e274d709de5fd9879961772210 (patch) | |
| tree | d7d1767519b4631349ca244a988478f808163919 /storage/xtradb | |
| parent | db0aed93482759844af7b39c9bf6e7fe141f28f6 (diff) | |
| parent | 27095a24f6cb0e8c859c1a3f76050e6b5a6434c6 (diff) | |
| download | mariadb-git-557f0d3ad04111e274d709de5fd9879961772210.tar.gz | |
5.2->5.3 merge
Diffstat (limited to 'storage/xtradb')
| -rw-r--r-- | storage/xtradb/buf/buf0buf.c | 4 | ||||
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/xtradb/buf/buf0buf.c b/storage/xtradb/buf/buf0buf.c index 8f9c40878f7..40a907b4199 100644 --- a/storage/xtradb/buf/buf0buf.c +++ b/storage/xtradb/buf/buf0buf.c @@ -3895,7 +3895,6 @@ buf_page_io_complete( enum buf_io_fix io_type; const ibool uncompressed = (buf_page_get_state(bpage) == BUF_BLOCK_FILE_PAGE); - //enum buf_flush flush_type; mutex_t* block_mutex; ut_a(buf_page_in_file(bpage)); @@ -4049,7 +4048,8 @@ corrupt: } } - //buf_pool_mutex_enter(); + //enum buf_flush flush_type; + //buf_pool_mutex_enter(); if (io_type == BUF_IO_WRITE) { //flush_type = buf_page_get_flush_type(bpage); /* to keep consistency at buf_LRU_insert_zip_clean() */ diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index 4eee85db06b..783508658a3 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -7289,7 +7289,7 @@ ha_innobase::create( if (srv_file_per_table && !mysqld_embedded - && (!create_info->options & HA_LEX_CREATE_TMP_TABLE)) { + && !(create_info->options & HA_LEX_CREATE_TMP_TABLE)) { if ((name[1] == ':') || (name[0] == '\\' && name[1] == '\\')) { |