• unknown's avatar
    Merge bodhi.local:/opt/local/work/mysql-5.0-4968 · 7c6fe6e7
    unknown authored
    into  bodhi.local:/opt/local/work/mysql-5.1-runtime
    
    
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    tests/mysql_client_test.c:
      Manual merge.
    7c6fe6e7
sql_prepare.cc 85.2 KB