• unknown's avatar
    Merge mysql.com:/home/jimw/my/mysql-5.0-11602 · 1ea0632e
    unknown authored
    into  mysql.com:/home/jimw/my/mysql-5.0-clean
    
    
    client/mysqltest.c:
      Auto merged
    sql/sp.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/share/errmsg.txt:
      Resolve conflict
    1ea0632e
errmsg.txt 320 KB