Commit 8998e128 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/wl2077 

into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
parents 3d52cdef 343b645b

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -939,3 +939,4 @@ ndbcluster-1186/ndb_3_cluster.log 
ndbcluster-1186/ndb_3_out.log

ndbcluster-1186/ndbcluster.pid

ndb/tools/ndb_restore

ac_available_languages_fragment

VC++Files/client/mysqladmin.dsp

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ LINK32=xilink6.exe 
# Name "mysqladmin - Win32 classic"

# Begin Source File



SOURCE=.\mysqladmin.c

SOURCE=.\mysqladmin.cpp

# End Source File

# End Target

# End Project

extra/perror.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static HA_ERRORS ha_errlist[]= 
{

  { 120,"Didn't find key on read or update" },

  { 121,"Duplicate key on write or update" },

  { 123,"Someone has changed the row since it was read; Update with is recoverable" },

  { 123,"Someone has changed the row since it was read (while the table was locked to prevent it)" },

  { 124,"Wrong index given to function" },

  { 126,"Index file is crashed" },

  { 127,"Record-file is crashed" },

heap/hp_rfirst.c

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ int heap_rfirst(HP_INFO *info, byte *record, int inx) 
      my_errno=HA_ERR_END_OF_FILE;

      DBUG_RETURN(my_errno);

    }

    DBUG_ASSERT(0); /* TODO fix it */

    info->current_record=0;

    info->current_hash_ptr=0;

    info->update=HA_STATE_PREV_FOUND;

myisam/ft_boolean_search.c

+2 −2
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static void _ftb_init_index_search(FT_INFO *ftb) 
          FTB_EXPR *top_ftbe=ftbe->up->up;

          ftbw->docid[0]=HA_OFFSET_ERROR;

          for (ftbe=ftbw->up; ftbe != top_ftbe; ftbe=ftbe->up)

            if (ftbe->flags & FTB_FLAG_YES)

            if (!(ftbe->flags & FTB_FLAG_NO))

              ftbe->yweaks++;

          ftbe=0;

          break;
@@ -356,7 +356,7 @@ static void _ftb_init_index_search(FT_INFO *ftb) 
      }

      if (!ftbe)

        continue;

      /* 3 */

      /* 4 */

      if (!is_tree_inited(& ftb->no_dupes))

        init_tree(& ftb->no_dupes,0,0,sizeof(my_off_t),

            _ftb_no_dupes_cmp,0,0,0);