Commit 1b927d48 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/jonas/src/mysql-4.1
parents 77b83ce6 3a23b675

BitKeeper/etc/gone

+1 −0
Original line number Diff line number Diff line
@@ -750,6 +750,7 @@ mwagner@work.mysql.com|mysql-test/r/3.23/sel000001.result|20001010091454|28284|3 
mwagner@work.mysql.com|mysql-test/r/3.23/sel000002.result|20001010091454|29230|d1787e6fd5dbc1cc

nick@nick.leippe.com|mysql-test/r/rpl_empty_master_crash.result|20020531235552|47718|615f521be2132141

nick@nick.leippe.com|mysql-test/t/rpl_empty_master_crash.test|20020531235552|52328|99464e737639ccc6

reggie@mdk10.(none)|mysql-test/t/reserved_win_names-master.opt|20050520210356|14878|e56da049a7ce9a5b

sasha@mysql.sashanet.com|BitKeeper/etc/logging_ok|20000801000905|12967|5b7d847a2158554

sasha@mysql.sashanet.com|build-tags|20011125054855|05181|7afb7e785b80f97

sasha@mysql.sashanet.com|build-tags|20011201050944|25384|b6f6fff142121618

BitKeeper/etc/logging_ok

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ bar@gw.udmsearch.izhnet.ru 
bar@mysql.com

bar@noter.intranet.mysql.r18.ru

bell@51.0.168.192.in-addr.arpa

bell@book.sanja.is.com.ua

bell@laptop.sanja.is.com.ua

bell@sanja.is.com.ua

bk@admin.bk
@@ -48,6 +49,7 @@ dlenev@mysql.com 
ejonore@mc03.ndb.mysql.com

evgen@moonbone.(none)

evgen@moonbone.local

gbichot@bk-internal.mysql.com

gbichot@production.mysql.com

gbichot@quadita2.mysql.com

gbichot@quadxeon.mysql.com
@@ -249,6 +251,7 @@ tonu@x3.internalnet 
tsmith@build.mysql.com

tulin@build.mysql.com

tulin@dl145b.mysql.com

tulin@dl145c.mysql.com

tulin@mysql.com

ulli@morbus.(none)

venu@hundin.mysql.fi

VC++Files/mysys/mysys.dsp

+5 −0
Original line number Diff line number Diff line
@@ -186,6 +186,11 @@ SOURCE=.\array.c 
!ENDIF



# End Source File

 

# Begin Source File

SOURCE=".\my_access.c"

# End Source File

 

# Begin Source File



SOURCE=".\charset-def.c"

VC++Files/mysys/mysys_ia64.dsp

+7 −0
Original line number Diff line number Diff line
@@ -163,6 +163,13 @@ LIB32=link.exe -lib 
# Name "mysys - WinIA64 Max"

# Name "mysys - WinIA64 TLS_DEBUG"

# Name "mysys - WinIA64 TLS"



# Begin Source File



SOURCE=.\my_access.c



# End Source File

 

# Begin Source File



SOURCE=.\array.c

client/mysql.cc

+4 −3
Original line number Diff line number Diff line
@@ -2051,7 +2051,8 @@ print_table_data(MYSQL_RES *result) 
    separator.fill(separator.length()+length+2,'-');

    separator.append('+');

  }

  tee_puts(separator.c_ptr_safe(), PAGER);

  separator.append('\0');                       // End marker for \0

  tee_puts((char*) separator.ptr(), PAGER);

  if (column_names)

  {

    mysql_field_seek(result,0);
@@ -2064,7 +2065,7 @@ print_table_data(MYSQL_RES *result) 
      num_flag[off]= IS_NUM(field->type);

    }

    (void) tee_fputs("\n", PAGER);

    tee_puts(separator.c_ptr(), PAGER);

    tee_puts((char*) separator.ptr(), PAGER);

  }



  while ((cur= mysql_fetch_row(result)))
@@ -2093,7 +2094,7 @@ print_table_data(MYSQL_RES *result) 
    }

    (void) tee_fputs("\n", PAGER);

  }

  tee_puts(separator.c_ptr(), PAGER);

  tee_puts((char*) separator.ptr(), PAGER);

  my_afree((gptr) num_flag);

}