• unknown's avatar
    Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 · 077840fa
    unknown authored
    into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
    
    
    include/thr_alarm.h:
      Auto merged
    mysys/my_pthread.c:
      Auto merged
    BUILD/SETUP.sh:
      Merged from 4.0
    configure.in:
      Merged from 4.0
    include/my_global.h:
      Merged from 4.0
    include/my_pthread.h:
      Merged from 4.0
    mysys/thr_alarm.c:
      Merged from 4.0
    sql/mysqld.cc:
      Merged from 4.0
    BUILD/SETUP.sh.rej:
      Merged from 4.0
    configure.in.rej:
      Merged from 4.0
    include/my_global.h.rej:
      Merged from 4.0
    include/my_pthread.h.rej:
      Merged from 4.0
    mysys/thr_alarm.c.rej:
      Merged from 4.0
    sql/mysqld.cc.rej:
      Merged from 4.0
    077840fa
my_global.h 40.3 KB