• unknown's avatar
    Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp · 1e140677
    unknown authored
    into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
    
    
    configure.in:
      Auto merged
    include/config-win.h:
      Auto merged
    include/m_string.h:
      Auto merged
    include/my_pthread.h:
      Auto merged
    myisam/mi_search.c:
      Auto merged
    mysql-test/r/cast.result:
      Auto merged
    mysql-test/t/cast.test:
      Auto merged
    mysql-test/t/select.test:
      Auto merged
    mysys/my_pthread.c:
      Auto merged
    mysys/thr_alarm.c:
      Auto merged
    netware/pack_isam.def:
      Auto merged
    sql/item.h:
      Auto merged
    sql/item_cmpfunc.cc:
      Auto merged
    strings/ctype-big5.c:
      Auto merged
    strings/ctype-tis620.c:
      Auto merged
    strings/xml.c:
      Auto merged
    vio/vio.c:
      Auto merged
    vio/viosocket.c:
      Auto merged
    mysql-test/r/select.result:
      Merged from 4.1.
    netware/BUILD/mwenv:
      Merged from 4.1.
    scripts/make_binary_distribution.sh:
      Merged from 4.1.
    sql/mysqld.cc:
      Merged from 4.1.
    sql/sql_show.cc:
      Merged from 4.1.
    strings/my_strtoll10.c:
      Merged from 4.1.
    1e140677
m_string.h 7.89 KB