• unknown's avatar
    Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · d4767576
    unknown authored
    into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
    
    
    mysql-test/r/derived.result:
      Auto merged
    mysql-test/t/derived.test:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_update.cc:
      Auto merged
    d4767576
sql_update.cc 29.8 KB