• unknown's avatar
    Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 · 059565d7
    unknown authored
    into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
    
    
    client/mysqldump.c:
      Auto merged
    include/my_global.h:
      Auto merged
    include/my_sys.h:
      Auto merged
    mysql-test/r/sp.result:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/sp_head.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_repl.cc:
      Auto merged
    storage/myisam/myisamchk.c:
      Auto merged
    storage/myisam/myisampack.c:
      Auto merged
    059565d7
my_global.h 44.5 KB