Develop merge

2017-06-29 15:34:22 +02:00
parent 4993fd683c
commit cb57e10761
122 changed files with 16937 additions and 1627 deletions
--- a/server/modules/protocol/examples/cdc_schema.py
+++ b/server/modules/protocol/examples/cdc_schema.py
@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python

 # Copyright (c) 2016 MariaDB Corporation Ab
 #
@ -38,7 +38,7 @@ def parse_field(row):

    res["real_type"] = name

-    if len(parts) > 1:
+    if len(parts) > 1 and name not in ["enum", "set", "decimal"]:
        res["length"] = int(parts[1].split(')')[0])
    else:
        res["length"] = -1