diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2015-05-01 15:59:12 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2015-05-01 15:59:12 +0200 |
| commit | f5b05a11c1d8f5817b957f5397c288146a348b29 (patch) | |
| tree | 185f88c7b78f1189782b45e2e03063b31b647990 /storage/connect/mysql-test | |
| parent | eae8318b19da168e4676fe3da5b2f8665cb4104c (diff) | |
| download | mariadb-git-f5b05a11c1d8f5817b957f5397c288146a348b29.tar.gz | |
- Fix bug on updating JSON expanded values
modified:
json.result
tabjson.cpp
tabjson.h
- Fix bug on multiple tables (directories must be eliminated from file list)
modified:
tabmul.cpp
- Update version
modified:
ha_connect.cc
- Typo
modified:
global.h
ha_connect.cc
tabtbl.cpp
tabutil.cpp
value.cpp
Diffstat (limited to 'storage/connect/mysql-test')
| -rw-r--r-- | storage/connect/mysql-test/connect/r/json.result | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/connect/mysql-test/connect/r/json.result b/storage/connect/mysql-test/connect/r/json.result index fa6497e5bba..80b0a2cbc18 100644 --- a/storage/connect/mysql-test/connect/r/json.result +++ b/storage/connect/mysql-test/connect/r/json.result @@ -89,8 +89,8 @@ ISBN Language Subject AuthorFN AuthorLN Title Translation Translator Publisher L UPDATE t1 SET AuthorFN = 'Philippe' WHERE AuthorLN = 'Knab'; SELECT * FROM t1 WHERE ISBN = '9782212090819'; ISBN Language Subject AuthorFN AuthorLN Title Translation Translator Publisher Location Year -9782212090819 fr applications Philippe Bernadac Construire une application XML NULL NULL Eyrolles Paris 1999 -9782212090819 fr applications François Knab Construire une application XML NULL NULL Eyrolles Paris 1999 +9782212090819 fr applications Jean-Christophe Bernadac Construire une application XML NULL NULL Eyrolles Paris 1999 +9782212090819 fr applications Philippe Knab Construire une application XML NULL NULL Eyrolles Paris 1999 # # To add an author a new table must be created # @@ -104,8 +104,8 @@ William J. Pardi INSERT INTO t2 VALUES('Charles','Dickens'); SELECT * FROM t1; ISBN Language Subject AuthorFN AuthorLN Title Translation Translator Publisher Location Year -9782212090819 fr applications Philippe Bernadac Construire une application XML NULL NULL Eyrolles Paris 1999 -9782212090819 fr applications François Knab Construire une application XML NULL NULL Eyrolles Paris 1999 +9782212090819 fr applications Jean-Christophe Bernadac Construire une application XML NULL NULL Eyrolles Paris 1999 +9782212090819 fr applications Philippe Knab Construire une application XML NULL NULL Eyrolles Paris 1999 9782840825685 fr applications William J. Pardi XML en Action adapté de l'anglais par James Guerin Microsoft Press Paris 1999 9782840825685 fr applications Charles Dickens XML en Action adapté de l'anglais par James Guerin Microsoft Press Paris 1999 DROP TABLE t1; @@ -127,11 +127,11 @@ line "SUBJECT": "applications", "AUTHOR": [ { - "FIRSTNAME": "Philippe", + "FIRSTNAME": "Jean-Christophe", "LASTNAME": "Bernadac" }, { - "FIRSTNAME": "François", + "FIRSTNAME": "Philippe", "LASTNAME": "Knab" } ], |