diff options
| author | Olivier Bertrand <bertrandop@gmail.com> | 2014-09-06 18:08:28 +0200 |
|---|---|---|
| committer | Olivier Bertrand <bertrandop@gmail.com> | 2014-09-06 18:08:28 +0200 |
| commit | a1c3656e01f26712a1fd9fca043b0280c2b9cea3 (patch) | |
| tree | 45a8dbcc8caf66fd5f3ce16e4a9af99f60dd806a /storage/connect | |
| parent | 4aac44d257c122920682ecea3501efb06eefe2cd (diff) | |
| download | mariadb-git-a1c3656e01f26712a1fd9fca043b0280c2b9cea3.tar.gz | |
- Fix MDEV-6624 (indexing on void table)
modified:
storage/connect/ha_connect.cc
- Suppress "Position array is null" warning.
modified:
storage/connect/filamtxt.cpp
storage/connect/mysql-test/connect/r/part_table.result
Diffstat (limited to 'storage/connect')
| -rw-r--r-- | storage/connect/filamtxt.cpp | 10 | ||||
| -rw-r--r-- | storage/connect/ha_connect.cc | 6 | ||||
| -rw-r--r-- | storage/connect/mysql-test/connect/r/part_table.result | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/storage/connect/filamtxt.cpp b/storage/connect/filamtxt.cpp index 5cabf980554..9c23944ff42 100644 --- a/storage/connect/filamtxt.cpp +++ b/storage/connect/filamtxt.cpp @@ -350,8 +350,9 @@ int TXTFAM::UpdateSortedRows(PGLOBAL g) /* Get the stored update values and sort them. */ /*********************************************************************/ if (!(Posar = MakeValueArray(g, To_Pos))) { - strcpy(g->Message, "Position array is null"); - return RC_INFO; +// strcpy(g->Message, "Position array is null"); +// return RC_INFO; + return RC_OK; // Nothing to do } else if (!(Sosar = MakeValueArray(g, To_Sos))) { strcpy(g->Message, "Start position array is null"); goto err; @@ -401,8 +402,9 @@ int TXTFAM::DeleteSortedRows(PGLOBAL g) /* Get the stored delete values and sort them. */ /*********************************************************************/ if (!(Posar = MakeValueArray(g, To_Pos))) { - strcpy(g->Message, "Position array is null"); - return RC_INFO; +// strcpy(g->Message, "Position array is null"); +// return RC_INFO; + return RC_OK; // Nothing to do } else if (!(Sosar = MakeValueArray(g, To_Sos))) { strcpy(g->Message, "Start position array is null"); goto err; diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index da491c7fa16..2e1d59ff632 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -2946,8 +2946,10 @@ int ha_connect::index_init(uint idx, bool sorted) ((PTDBDOX)tdbp)->GetTxfp()->ResetBuffer(g); active_index= idx; - } else // Void table - indexing= 0; +// } else { // Void table +// active_index= MAX_KEY; +// indexing= 0; + } // endif Num rc= 0; } // endif indexing diff --git a/storage/connect/mysql-test/connect/r/part_table.result b/storage/connect/mysql-test/connect/r/part_table.result index e447caca615..122c328fa59 100644 --- a/storage/connect/mysql-test/connect/r/part_table.result +++ b/storage/connect/mysql-test/connect/r/part_table.result @@ -148,7 +148,6 @@ UPDATE t1 SET msg = 'number' WHERE id in (60,72); Warnings: Note 1105 xt3: 2 affected rows Note 1105 xt3: 0 affected rows -Warning 1105 xt3: (1105) Position array is null UPDATE t1 SET msg = 'soixante' WHERE id = 60; Warnings: Note 1105 xt3: 1 affected rows |