• unknown's avatar
    merge 4.1->5.0 · 8a898a0b
    unknown authored
    
    mysql-test/r/group_by.result:
      Auto merged
    mysql-test/r/metadata.result:
      Auto merged
    mysql-test/r/union.result:
      Auto merged
    mysql-test/t/union.test:
      Auto merged
    sql/item.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    support-files/mysql.server.sh:
      Auto merged
    8a898a0b
sql_prepare.cc 65.4 KB