diff options
author | Olivier Bertrand <bertrandop@gmail.com> | 2013-04-02 11:06:19 +0200 |
---|---|---|
committer | Olivier Bertrand <bertrandop@gmail.com> | 2013-04-02 11:06:19 +0200 |
commit | 42e5bfacc841b98f804a74c9aafc95592b45b616 (patch) | |
tree | de8a35a66c78c3ae98b2851a21d7988e0e15ca98 /storage/connect | |
parent | af08a68fbeaaed31fd4fd2729e8c5d48b370f249 (diff) | |
parent | f284c9b77d0ae85537543149ee997969c98e9c46 (diff) | |
download | mariadb-git-42e5bfacc841b98f804a74c9aafc95592b45b616.tar.gz |
- Commit merged changes
modified:
mysql-test/suite/connect/r/ini.result
mysql-test/suite/connect/r/vec.result
mysql-test/suite/connect/t/ini.test
mysql-test/suite/connect/t/vec.test
storage/connect/ha_connect.cc
Diffstat (limited to 'storage/connect')
-rw-r--r-- | storage/connect/ha_connect.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index beb8efee887..45d2a601a45 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -3997,7 +3997,7 @@ int ha_connect::create(const char *name, TABLE *table_arg, #endif // !LIBXML2_SUPPORT if (!xsup) - push_warning(table->in_use, + push_warning(table_arg->in_use, MYSQL_ERROR::WARN_LEVEL_WARN, 0, g->Message); } // endif type |