Commit 4d8c332f authored by unknown's avatar unknown
Browse files

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/space/my/mysql-4.1
parents dca7c50e e74d5313

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -100,4 +100,4 @@ tags: 
# Test installation



test:

	cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol
 
	cd mysql-test; perl mysql-test-run.pl && perl mysql-test-run.pl --ps-protocol

VC++Files/client/mysqlclient.dsp

+4 −0
Original line number Diff line number Diff line
@@ -322,6 +322,10 @@ SOURCE=..\mysys\mulalloc.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_access.c

# End Source File

# Begin Source File



SOURCE=..\mysys\my_alloc.c

# End Source File

# Begin Source File

VC++Files/libmysql/libmysql.dsp

+4 −0
Original line number Diff line number Diff line
@@ -295,6 +295,10 @@ SOURCE=..\mysys\mulalloc.c 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_access.c

# End Source File

# Begin Source File



SOURCE=..\mysys\my_alloc.c

# End Source File

# Begin Source File

client/mysql.cc

+2 −1
Original line number Diff line number Diff line
@@ -989,7 +989,8 @@ static int read_lines(bool execute_commands) 
        a nil, it still needs the space in the linebuffer for it. This is,

        naturally, undocumented.

       */

      } while (linebuffer[0] <= linebuffer[1] + 1);

      } while ((unsigned char)linebuffer[0] <=

               (unsigned char)linebuffer[1] + 1);

      line= buffer.c_ptr();

#endif /* __NETWARE__ */

#else

myisam/ft_boolean_search.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ FT_INFO * ft_init_boolean_search(MI_INFO *info, uint keynr, byte *query, 
    Hack: instead of init_queue, we'll use reinit queue to be able

    to alloc queue with alloc_root()

  */

  res=ftb->queue.max_elements=1+query_len/(min(ft_min_word_len,2)+1);

  res=ftb->queue.max_elements=1+query_len/2;

  if (!(ftb->queue.root=

        (byte **)alloc_root(&ftb->mem_root, (res+1)*sizeof(void*))))

    goto err;