diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-12-02 22:25:16 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-12-02 22:25:16 +0100 |
| commit | 853077ad7e81be1ade20b4beab1b95d5766d87b1 (patch) | |
| tree | 4c158691947ba7beb4577f26b160f243eabf39ef /storage/oqgraph | |
| parent | bf3b4a23f75de50e0f1ab4a562e5801dabc7305b (diff) | |
| parent | 2b5db1d5bcd7b46b654d59a07fc119ef6a6b8651 (diff) | |
| download | mariadb-git-853077ad7e81be1ade20b4beab1b95d5766d87b1.tar.gz | |
Merge branch '10.0' into bb-10.1-merge
Conflicts:
.bzrignore
VERSION
cmake/plugin.cmake
debian/dist/Debian/control
debian/dist/Ubuntu/control
mysql-test/r/join_outer.result
mysql-test/r/join_outer_jcl6.result
mysql-test/r/null.result
mysql-test/r/old-mode.result
mysql-test/r/union.result
mysql-test/t/join_outer.test
mysql-test/t/null.test
mysql-test/t/old-mode.test
mysql-test/t/union.test
packaging/rpm-oel/mysql.spec.in
scripts/mysql_config.sh
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_ndbcluster_cond.cc
sql/item_cmpfunc.h
sql/lock.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_update.cc
sql/sql_yacc.yy
storage/innobase/buf/buf0flu.cc
storage/innobase/fil/fil0fil.cc
storage/innobase/include/srv0srv.h
storage/innobase/lock/lock0lock.cc
storage/tokudb/CMakeLists.txt
storage/xtradb/buf/buf0flu.cc
storage/xtradb/fil/fil0fil.cc
storage/xtradb/include/srv0srv.h
storage/xtradb/lock/lock0lock.cc
support-files/mysql.spec.sh
Diffstat (limited to 'storage/oqgraph')
| -rw-r--r-- | storage/oqgraph/ha_oqgraph.cc | 6 | ||||
| -rw-r--r-- | storage/oqgraph/oqgraph_thunk.cc | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/storage/oqgraph/ha_oqgraph.cc b/storage/oqgraph/ha_oqgraph.cc index 6294b0dc35b..f4a00c2dd14 100644 --- a/storage/oqgraph/ha_oqgraph.cc +++ b/storage/oqgraph/ha_oqgraph.cc @@ -26,6 +26,8 @@ #pragma implementation // gcc: Class implementation #endif +#include <my_config.h> + #define MYSQL_SERVER // to have THD #include <mysql/plugin.h> #include "sql_class.h" @@ -858,7 +860,7 @@ static int parse_latch_string_to_legacy_int(const String& value, int &latch) unsigned long int v = strtoul( latchValue.c_ptr_safe(), &eptr, 10); if (!*eptr) { // we had an unsigned number; remember 0 is valid too ('vertices' aka 'no_search')) - if (v >= 0 && v < oqgraph::NUM_SEARCH_OP) { + if (v < oqgraph::NUM_SEARCH_OP) { latch = v; return true; } @@ -1068,7 +1070,7 @@ int ha_oqgraph::rnd_init(bool scan) int ha_oqgraph::rnd_next(byte *buf) { int res; - open_query::row row = {}; + open_query::row row = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; if (!(res= graph->fetch_row(row))) res= fill_record(buf, row); diff --git a/storage/oqgraph/oqgraph_thunk.cc b/storage/oqgraph/oqgraph_thunk.cc index e929ca3f5b0..0e7b1f2b8ed 100644 --- a/storage/oqgraph/oqgraph_thunk.cc +++ b/storage/oqgraph/oqgraph_thunk.cc @@ -22,17 +22,18 @@ ====================================================================== */ +#include <my_config.h> #include "oqgraph_thunk.h" #include <boost/tuple/tuple.hpp> #define MYSQL_SERVER -#include "mysql_version.h" +#include <my_global.h> +#include "unireg.h" #include "sql_base.h" #include "table.h" #include "field.h" #include "key.h" -#include "unireg.h" #if MYSQL_VERSION_ID < 100000 // Allow compatibility with build for 5.5.32 |