~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_rsame.cc

  • Committer: Brian Aker
  • Date: 2010-01-22 00:53:13 UTC
  • Revision ID: brian@gaz-20100122005313-jmizcbcdi1lt4tcx
Revert db patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
 
12
12
   You should have received a copy of the GNU General Public License
13
13
   along with this program; if not, write to the Free Software
14
 
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
 
14
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
15
15
 
16
16
#include "myisam_priv.h"
17
17
#include <drizzled/util/test.h>
18
18
 
19
 
using namespace drizzled;
20
19
 
21
20
        /*
22
21
        ** Find current row with read on position or read on key
49
48
    info->lastinx=inx;
50
49
    info->lastkey_length=_mi_make_key(info,(uint) inx,info->lastkey,record,
51
50
                                      info->lastpos);
 
51
    if (info->s->concurrent_insert)
 
52
      pthread_rwlock_rdlock(&info->s->key_root_lock[inx]);
52
53
    _mi_search(info,info->s->keyinfo+inx,info->lastkey, USE_WHOLE_KEY,
53
54
               SEARCH_SAME,
54
55
               info->s->state.key_root[inx]);
 
56
    if (info->s->concurrent_insert)
 
57
      pthread_rwlock_unlock(&info->s->key_root_lock[inx]);
55
58
  }
56
59
 
57
60
  if (!(*info->read_record)(info,info->lastpos,record))