Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2016-01-05 12:42:09 +01:00
parent c9649b60a9 6fbe632d08
commit f00046c818
4 changed files with 384 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

742
arangod/Aql/grammar.cpp
View File

File diff suppressed because it is too large Load Diff

12
arangod/Aql/grammar.h
View File

@ -1,8 +1,8 @@
/* A Bison parser, made by GNU Bison 3.0.2. */
/* A Bison parser, made by GNU Bison 3.0.4. */
/* Bison interface for Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -116,10 +116,10 @@ extern int Aqldebug;
/* Value type. */
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE YYSTYPE;
union YYSTYPE
{
#line 17 "arangod/Aql/grammar.y" /* yacc.c:1909 */
#line 17 "arangod/Aql/grammar.y" /* yacc.c:1915 */
triagens::aql::AstNode* node;
struct {
@ -129,8 +129,10 @@ union YYSTYPE
bool boolval;
int64_t intval;
#line 133 "arangod/Aql/grammar.hpp" /* yacc.c:1909 */
#line 133 "arangod/Aql/grammar.hpp" /* yacc.c:1915 */
};
typedef union YYSTYPE YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define YYSTYPE_IS_DECLARED 1
#endif

2
arangod/VocBase/collection.cpp
View File

@ -1129,7 +1129,7 @@ VocbaseCollectionInfo::VocbaseCollectionInfo (TRI_vocbase_t* vocbase,
memset(_name, 0, sizeof(_name));
if (name != '\0') {
if (name != nullptr && *name != '\0') {
TRI_CopyString(_name, name, sizeof(_name) - 1);
}

5
js/server/modules/@arangodb/foxx/mocha.js
View File

@ -35,6 +35,7 @@ var MochaSuite = require('mocha/lib/suite');
var MochaRunner = require('mocha/lib/runner');
var BaseReporter = require('mocha/lib/reporters/base');
var DefaultReporter = require('mocha/lib/reporters/json');
var isWindows = require('internal').platform.substr(0, 3) === 'win';
function notIn(arr) {
return function (item) {
@ -127,7 +128,9 @@ function findTestFiles(app) {
});
return paths.filter(function (path) {
return path && matchers.some(function (pattern) {
return pattern.match(path);
return pattern.match(
isWindows ? path.replace(/\\/g, '/') : path
);
}) && fs.isFile(fs.join(basePath, path));
});
}