summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-12 16:47:14 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-12 16:47:14 +0100
commit27095a24f6cb0e8c859c1a3f76050e6b5a6434c6 (patch)
tree793f6a4bbb8edbc49c12ffb28526ce7f885ca3bb /storage
parent755cd443f95f8e6d064b18af3fb0c496b82abfe7 (diff)
parent5c7aa5f2ae533d395b4c7460d8a388b6326a5add (diff)
downloadmariadb-git-27095a24f6cb0e8c859c1a3f76050e6b5a6434c6.tar.gz
5.1 merge
Diffstat (limited to 'storage')
-rw-r--r--storage/xtradb/handler/ha_innodb.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc
index dfe98f09e4f..7f6ba6beae4 100644
--- a/storage/xtradb/handler/ha_innodb.cc
+++ b/storage/xtradb/handler/ha_innodb.cc
@@ -6972,7 +6972,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] == '\\')) {