• unknown's avatar
    Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4d3dce7f
    unknown authored
    into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
    
    
    mysys/my_error.c:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/share/czech/errmsg.txt:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/share/dutch/errmsg.txt:
      Auto merged
    sql/share/english/errmsg.txt:
      Auto merged
    sql/share/estonian/errmsg.txt:
      Auto merged
    sql/share/french/errmsg.txt:
      Auto merged
    sql/share/german/errmsg.txt:
      Auto merged
    sql/share/greek/errmsg.txt:
      Auto merged
    sql/share/hungarian/errmsg.txt:
      Auto merged
    sql/share/italian/errmsg.txt:
      Auto merged
    sql/share/japanese/errmsg.txt:
      Auto merged
    sql/share/korean/errmsg.txt:
      Auto merged
    sql/share/norwegian-ny/errmsg.txt:
      Auto merged
    sql/share/norwegian/errmsg.txt:
      Auto merged
    sql/share/polish/errmsg.txt:
      Auto merged
    sql/share/portuguese/errmsg.txt:
      Auto merged
    sql/share/romanian/errmsg.txt:
      Auto merged
    sql/share/russian/errmsg.txt:
      Auto merged
    sql/share/slovak/errmsg.txt:
      Auto merged
    sql/share/spanish/errmsg.txt:
      Auto merged
    sql/share/swedish/errmsg.txt:
      Auto merged
    sql/share/ukrainian/errmsg.txt:
      Auto merged
    4d3dce7f
mysqld.cc 218 KB