Commits · 0bfb5bee46cc21a22802eca77f7b4568bc6d5ed3 · Kirill Smelkov / mariadb

25 Jan, 2016 2 commits

Merge branch 'ob-10.0' into 10.0 · 0bfb5bee
Olivier Bertrand authored Jan 25, 2016

0bfb5bee

- Change SQL_NTS to 0 when the string is NULL · 62a5e56c

Olivier Bertrand authored Jan 25, 2016

  modified:   storage/connect/odbconn.cpp

- Fix to MDEV-9446 (using Json UDFs when CONNECT is not installed)
  modified:   storage/connect/ha_connect.cc
  modified:   storage/connect/jsonudf.cpp
  modified:   storage/connect/jsonudf.h
  modified:   storage/connect/mysql-test/connect/r/json_udf.result
  modified:   storage/connect/mysql-test/connect/t/json_udf.inc
  modified:   storage/connect/mysql-test/connect/t/json_udf.test
  modified:   storage/connect/mysql-test/connect/t/json_udf2.inc

62a5e56c

10 Jan, 2016 1 commit
- Merge branch 'ob-10.0' into 10.0 · 7cd94c68
  Olivier Bertrand authored Jan 10, 2016
  
  7cd94c68
09 Jan, 2016 1 commit

- Fix MDEV-9239. Meanwhile, make all references to the database in XTAB Schema · 0891ae2f

Olivier Bertrand authored Jan 09, 2016

  (was sometimes in XTAB Catalog)
  modified:   storage/connect/mycat.cc
  modified:   storage/connect/mycat.h
  modified:   storage/connect/reldef.cpp
  modified:   storage/connect/reldef.h
  modified:   storage/connect/tabmysql.cpp
  modified:   storage/connect/tabpivot.cpp
  modified:   storage/connect/tabtbl.cpp
  modified:   storage/connect/tabutil.cpp

0891ae2f

27 Dec, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · e37372c1
  Olivier Bertrand authored Dec 27, 2015
  
  e37372c1
- - Fix MDEV-9322. · 6883e5c4
  Olivier Bertrand authored Dec 27, 2015
```
  modified:   storage/connect/json.cpp
```
  6883e5c4
14 Dec, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · 3f6159f7
  Olivier Bertrand authored Dec 14, 2015
  
  3f6159f7
- - Fix MDEV-9279. Replacing exit(1) in yy_fatal_error by a longjmp. · 11c339f4
  Olivier Bertrand authored Dec 14, 2015
```
  modified:   storage/connect/fmdlex.c
  modified:   storage/connect/plgdbutl.cpp
```
  11c339f4
13 Dec, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · 92326bf8
  Olivier Bertrand authored Dec 13, 2015
  
  92326bf8
- - Copy error message from G to g when using temporary storage for parsing. · 8286b680
  Olivier Bertrand authored Dec 13, 2015
```
  modified:   storage/connect/tabjson.cpp
```
  8286b680
11 Dec, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · 74b438fa
  Olivier Bertrand authored Dec 11, 2015
  
  74b438fa
- Update version number · 541d36f7
  Olivier Bertrand authored Dec 11, 2015
  
  541d36f7
08 Dec, 2015 2 commits

Commiting merge from ob-10.0 · f657aab9
Olivier Bertrand authored Dec 09, 2015

f657aab9

- Serialize: Protect again eventual longjmp's. · 8ba013a2

Olivier Bertrand authored Dec 08, 2015

Always return NULL on error.
Adding also the file length.
  modified:   storage/connect/json.cpp
  modified:   storage/connect/jsonudf.cpp

- JSONCOL::WriteColumn Add types SHORT and BIGINT as accepted
  modified:   storage/connect/tabjson.cpp

- TDBJSN: Make this type use a separate storage for Json parsing
and retrieve this memory between each rows. This is necessary
to be able to handle big tables. See MDEV-9228.
  modified:   storage/connect/tabjson.cpp
  modified:   storage/connect/tabjson.h

8ba013a2

05 Dec, 2015 3 commits

Fix memory error when a plain string argument is parsed. · d059dd73

Olivier Bertrand authored Dec 05, 2015

Parsing memory, not added in CalcLen, is added in CheckMemory.
Adding also the file length.
  modified:   storage/connect/jsonudf.cpp

d059dd73

Fix memory error when a plain string argument is parsed. · a6b8bfca

Olivier Bertrand authored Dec 05, 2015

Parsing memory, not added in CalcLen, is added in CheckMemory.
Oups... last commit was buggy
  modified:   storage/connect/jsonudf.cpp

a6b8bfca

Fix memory error when a plain string argument is parsed. · d3dc52e4
Olivier Bertrand authored Dec 05, 2015
```
Parsing memory, not added in CalcLen, is added in CheckMemory.
  modified:   storage/connect/jsonudf.cpp
```
d3dc52e4

04 Dec, 2015 1 commit
- Commit updating CONNECT from the 10.1 version · 27f9d2f9
  Olivier Bertrand authored Dec 04, 2015
  
  27f9d2f9
08 Nov, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · 406e3aaa
  Olivier Bertrand authored Nov 08, 2015
  
  406e3aaa
- PATCH-P0-FIX-UPSTREAM: Fix possible buffer overflow (MDEV-8317) · dc8a0df0
  Olivier Bertrand authored Nov 08, 2015
```
Maintainer: Michal Hrusecky <Michal.Hrusecky@opensuse.org>
(modified by O. Bertrand --> adding and using the XSTR macro)
  modified:   storage/connect/tabxml.cpp
```
  dc8a0df0
21 Oct, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · 41a3c58e
  Olivier Bertrand authored Oct 21, 2015
  
  41a3c58e
- Fix MDEV-8882 · b35f9972
  Olivier Bertrand authored Oct 21, 2015
```
  modified:   storage/connect/tabodbc.cpp
```
  b35f9972
20 Oct, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · ac9141cb
  Olivier Bertrand authored Oct 20, 2015
  
  ac9141cb
- Fix MDEV-8966 · d51e466e
  Olivier Bertrand authored Oct 20, 2015
```
  modified:   storage/connect/ha_connect.cc
```
  d51e466e
18 Oct, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · f5154229
  Olivier Bertrand authored Oct 18, 2015
  
  f5154229
- Fix MDEV-8926 · 90209463
  Olivier Bertrand authored Oct 18, 2015
```
  modified:   storage/connect/ha_connect.cc
```
  90209463
16 Sep, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · 80d12374
  Olivier Bertrand authored Sep 16, 2015
  
  80d12374
- Fix assert error for where clause with UDF's · 019c9e0a
  Olivier Bertrand authored Sep 16, 2015
```
    was fixed in HA_CONNECT::CondFilter moving res= pval->val_str(&tmp)
    but this was wrong. Now res is only used for strings.
  modified:   storage/connect/ha_connect.cc
```
  019c9e0a
08 Sep, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · d69931ee
  Olivier Bertrand authored Sep 09, 2015
  
  d69931ee
- Fix assert error for where clause with UDF's · e939ea58
  Olivier Bertrand authored Sep 09, 2015
```
    was fixed in HA_CONNECT::CondFilter moving pval->val_str(&tmp)
  modified:   storage/connect/ha_connect.cc
```
  e939ea58
14 Aug, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · cd9b9199
  Olivier Bertrand authored Aug 14, 2015
  
  cd9b9199
- Fix crash when SetValue_char is called with a negative length value. · 6d46c977
  Olivier Bertrand authored Aug 14, 2015
```
This can happen in odbconn.cpp when SQLFetch returns SQL_NO_TOTAL (-4) as length.
  modified:   storage/connect/odbconn.cpp
  modified:   storage/connect/value.cpp
```
  6d46c977
11 Aug, 2015 1 commit
- Prevent wrong update of expanded columns when pretty is not 2. · 335ec7a3
  Olivier Bertrand authored Aug 11, 2015
```
  modified:   storage/connect/tabjson.cpp
```
  335ec7a3
08 Aug, 2015 1 commit
- Merge branch 'ob-10.0' into 10.0 · 0eacebf1
  Olivier Bertrand authored Aug 08, 2015
  
  0eacebf1
06 Aug, 2015 1 commit

Fix the TDBDOS::EstimatedLength function that was wrongly counting · 5f533035

Olivier Bertrand authored Aug 06, 2015

    its calculation virtual and special columns.
  modified:   storage/connect/reldef.h
  modified:   storage/connect/tabdos.cpp

5f533035

30 Jul, 2015 2 commits
- Merge branch 'ob-10.0' into 10.0 · 8ab46a51
  Olivier Bertrand authored Jul 30, 2015
  
  8ab46a51
- Fix MDEV-8561 removing a wrong patch · 7962add6
  Olivier Bertrand authored Jul 30, 2015
```
  modified:   storage/connect/tabodbc.cpp
```
  7962add6
28 Jul, 2015 1 commit
- Merge branch 'ob-10.0' into 10.0 · 701af14b
  Olivier Bertrand authored Jul 28, 2015
  
  701af14b
22 Jul, 2015 1 commit
- Fix (?) retrieving integer arguments in JSON UDF's · 4efcc35a
  Olivier Bertrand authored Jul 22, 2015
```
  modified:   storage/connect/jsonudf.cpp
```
  4efcc35a
09 Jul, 2015 1 commit
- Resolving conflict on ha_connect.cc · b520febb
  Olivier Bertrand authored Jul 09, 2015
  
  b520febb