• unknown's avatar
    Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50 · 1e8c450d
    unknown authored
    into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/50
    
    
    sql/sql_parse.cc:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    mysql-test/r/ps.result:
      Manual merge
    mysql-test/t/ps.test:
      Manual merge
    1e8c450d
sql_prepare.cc 83.8 KB