• unknown's avatar
    Merge mysql.com:/home/bkroot/mysql-4.1 · d2a66935
    unknown authored
    into mysql.com:/home/bk/b6883-mysql-4.1
    
    
    mysql-test/r/innodb.result:
      Auto merged
    mysql-test/t/innodb.test:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    d2a66935
sql_parse.cc 165 KB