Merge branch 'master' into vet-tool

Author: ajnavarro

Gopkg.lock

@@ -1,6 +1,6 @@
 [[constraint]]
   name = "gopkg.in/src-d/go-mysql-server.v0"
-  revision = "bb5fe96ff756e5b25ec53c68c92d92c108832a65"
+  revision = "cb312768e257cb41e669331551e29e8a081e85b5"
 
 [[constraint]]
   name = "github.com/jessevdk/go-flags"
@@ -70,16 +70,20 @@
 
 [[override]]
   name = "github.com/pilosa/pilosa"
-  revision = "f62dbc00b96f596a1f2ef8b4e87ba8ec847eda37"
+  version = "1.3.0"
 
 [[override]]
   name = "github.com/pilosa/go-pilosa"
-  version = "0.10.0"
+  version = "1.3.0"
 
 [[override]]
   name = "github.com/src-d/go-oniguruma"
   version = "1.0.0"
 
+[[constraint]]
+  name = "gopkg.in/src-d/go-vitess.v1"
+  version = "1.6.0"
+
 [prune]
   [[prune.project]]
     name = "gopkg.in/src-d/go-mysql-server.v0"

Gopkg.toml

@@ -39,6 +39,7 @@ These are all functions that are available because they are implemented in `go-m
 |`DAYOFWEEK(date)`|Returns the day of the week of the given date.|
 |`DAYOFYEAR(date)`|Returns the day of the year of the given date.|
 |`FLOOR(number)`|Return the largest integer value that is less than or equal to `number`.|
+|`FROM_BASE64(str)`|Decodes the base64-encoded string str.|
 |`HOUR(date)`|Returns the hours of the given date.|
 |`IFNULL(expr1, expr2)`|If expr1 is not NULL, IFNULL() returns expr1; otherwise it returns expr2.|
 |`IS_BINARY(blob)`|Returns whether a BLOB is a binary file or not.|
@@ -73,7 +74,6 @@ These are all functions that are available because they are implemented in `go-m
 |`SUBSTRING(str, pos, [len])`|Return a substring from the provided string starting at `pos` with a length of `len` characters. If no `len` is provided, all characters from `pos` until the end will be taken.|
 |`SUM(expr)`|Returns the sum of expr in all rows.|
 |`TO_BASE64(str)`|Encodes the string str in base64 format.|
-|`FROM_BASE64(str)`|Decodes the base64-encoded string str.|
 |`TRIM(str)`|Returns the string str with all spaces removed.|
 |`UPPER(str)`|Returns the string str with all characters in upper case.|
 |`WEEKDAY(date)`|Returns the weekday of the given date.|

docs/using-gitbase/functions.md

@@ -26,4 +26,4 @@ and for the second query also two indexes will be used and the result will be a
 
 You can find some more examples in the [examples](./examples.md#create-an-index-for-columns-on-a-table) section.
 
-See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/bb5fe96ff756e5b25ec53c68c92d92c108832a65#indexes) documentation for more details
+See [go-mysql-server](https://github.com/src-d/go-mysql-server/tree/cb312768e257cb41e669331551e29e8a081e85b5#indexes) documentation for more details