• unknown's avatar
    Merge mysql.com:/opt/local/work/mysql-4.1-root · b0641a3b
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.0-root
    
    
    regex/regerror.c:
      Auto merged
    sql/sql_lex.cc:
      Auto merged
    mysql-test/r/ps.result:
      Manual merge
    mysql-test/t/ps.test:
      Manual merge
    sql/sql_yacc.yy:
      Manual merge
    b0641a3b
sql_lex.cc 52.2 KB