diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-22 11:13:10 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2016-05-22 11:13:10 +0200 |
| commit | 9a5c58602461511cddcb9485691e9ca5ca7f80a2 (patch) | |
| tree | c39b62dc732344ab1d3d2f2f35a3e26717898f44 /storage/connect/tabodbc.cpp | |
| parent | da34a8c08818e162ad19b0e16cca1b70181be700 (diff) | |
| parent | cee9ab9d85a8d75290b0d60bc7af26c8cf179a1d (diff) | |
| download | mariadb-git-9a5c58602461511cddcb9485691e9ca5ca7f80a2.tar.gz | |
Merge branch '10.0' of https://github.com/MariaDB/server into 10.0
Diffstat (limited to 'storage/connect/tabodbc.cpp')
| -rw-r--r-- | storage/connect/tabodbc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/connect/tabodbc.cpp b/storage/connect/tabodbc.cpp index b3b6c2919c0..5fd0534210d 100644 --- a/storage/connect/tabodbc.cpp +++ b/storage/connect/tabodbc.cpp @@ -818,7 +818,7 @@ int TDBODBC::GetMaxSize(PGLOBAL g) else if (!Cardinality(NULL)) MaxSize = 10; // To make MySQL happy else if ((MaxSize = Cardinality(g)) < 0) - MaxSize = 12; // So we can see an error occured + MaxSize = 12; // So we can see an error occurred } // endif MaxSize |