• unknown's avatar
    post-merge fixes to make it compile. It still fails the fulltext test, · d07fa9a7
    unknown authored
     (wrong error code) but I'll push it so that Sergei could clean up
     my merge
    
    
    include/mysqld_error.h:
      fixed typo
    mysql-test/r/order_by.result:
      updated result for merged test
    sql/Makefile.am:
      put back sql_union.cc lost during merge
    sql/mysql_priv.h:
      restored variables lost in the merge
    sql/mysqld.cc:
      put back lost variable declarations
    sql/share/czech/errmsg.txt:
      merge fix
    sql/share/danish/errmsg.txt:
      merge fix
    sql/share/dutch/errmsg.txt:
      merge fix
    sql/share/english/errmsg.txt:
      merge fix
    sql/share/estonian/errmsg.txt:
      merge fix
    sql/share/french/errmsg.txt:
      merge fix
    sql/share/german/errmsg.txt:
      merge fix
    sql/share/greek/errmsg.txt:
      merge fix
    sql/share/hungarian/errmsg.txt:
      merge fix
    sql/share/italian/errmsg.txt:
      merge fix
    sql/share/japanese/errmsg.txt:
      merge fix
    sql/share/korean/errmsg.txt:
      merge fix
    sql/share/norwegian-ny/errmsg.txt:
      merge fix
    sql/share/norwegian/errmsg.txt:
      merge fix
    sql/share/polish/errmsg.txt:
      merge fix
    sql/share/portuguese/errmsg.txt:
      merge fix
    sql/share/romanian/errmsg.txt:
      merge fix
    sql/share/russian/errmsg.txt:
      merge fix
    sql/share/slovak/errmsg.txt:
      merge fix
    sql/share/spanish/errmsg.txt:
      merge fix
    sql/share/swedish/errmsg.txt:
      merge fix
    sql/sql_acl.cc:
      merge fix
    d07fa9a7
errmsg.txt 13.2 KB