1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fix MDEV-6624 (indexing on void table)

Browse Source 
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
This commit is contained in:
Olivier Bertrand 2014-09-06 18:08:28 +02:00
parent 4aac44d257
commit a1c3656e01
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/connect/filamtxt.cpp
View File

@ -350,8 +350,9 @@ int TXTFAM::UpdateSortedRows(PGLOBAL g)
/* Get the stored update values and sort them. */ /* Get the stored update values and sort them. */
/*********************************************************************/ /*********************************************************************/
if (!(Posar = MakeValueArray(g, To_Pos))) { if (!(Posar = MakeValueArray(g, To_Pos))) {
strcpy(g->Message, "Position array is null"); // strcpy(g->Message, "Position array is null");
return RC_INFO; // return RC_INFO;
return RC_OK; // Nothing to do
} else if (!(Sosar = MakeValueArray(g, To_Sos))) { } else if (!(Sosar = MakeValueArray(g, To_Sos))) {
strcpy(g->Message, "Start position array is null"); strcpy(g->Message, "Start position array is null");
goto err; goto err;
@ -401,8 +402,9 @@ int TXTFAM::DeleteSortedRows(PGLOBAL g)
/* Get the stored delete values and sort them. */ /* Get the stored delete values and sort them. */
/*********************************************************************/ /*********************************************************************/
if (!(Posar = MakeValueArray(g, To_Pos))) { if (!(Posar = MakeValueArray(g, To_Pos))) {
strcpy(g->Message, "Position array is null"); // strcpy(g->Message, "Position array is null");
return RC_INFO; // return RC_INFO;
return RC_OK; // Nothing to do
} else if (!(Sosar = MakeValueArray(g, To_Sos))) { } else if (!(Sosar = MakeValueArray(g, To_Sos))) {
strcpy(g->Message, "Start position array is null"); strcpy(g->Message, "Start position array is null");
goto err; goto err;

6
storage/connect/ha_connect.cc
View File

@ -2946,8 +2946,10 @@ int ha_connect::index_init(uint idx, bool sorted)
((PTDBDOX)tdbp)->GetTxfp()->ResetBuffer(g); ((PTDBDOX)tdbp)->GetTxfp()->ResetBuffer(g);
active_index= idx; active_index= idx;
} else // Void table // } else { // Void table
indexing= 0; // active_index= MAX_KEY;
// indexing= 0;
} // endif Num
rc= 0; rc= 0;
} // endif indexing } // endif indexing

1
storage/connect/mysql-test/connect/r/part_table.result
View File

@ -148,7 +148,6 @@ UPDATE t1 SET msg = 'number' WHERE id in (60,72);
Warnings: Warnings:
Note 1105 xt3: 2 affected rows Note 1105 xt3: 2 affected rows
Note 1105 xt3: 0 affected rows Note 1105 xt3: 0 affected rows
Warning 1105 xt3: (1105) Position array is null
UPDATE t1 SET msg = 'soixante' WHERE id = 60; UPDATE t1 SET msg = 'soixante' WHERE id = 60;
Warnings: Warnings:
Note 1105 xt3: 1 affected rows Note 1105 xt3: 1 affected rows