• unknown's avatar
    fix after merge · bc15643c
    unknown authored
    
    Docs/manual.texi:
      Fix after merge
    include/my_global.h:
      merge fix
    mysql-test/r/create.result:
      merge fix
    mysys/thr_alarm.c:
      Fix for using --debug with alarms
    bc15643c
manual.texi 2.05 MB