• unknown's avatar
    Merge bk-internal:/home/bk/mysql-4.1/ · 017efd21
    unknown authored
    into serg.mylan:/usr/home/serg/Abk/mysql-4.1
    
    
    BitKeeper/etc/ignore:
      auto-union
    include/my_global.h:
      Auto merged
    mysql-test/r/ctype_utf8.result:
      Auto merged
    mysql-test/r/myisam.result:
      Auto merged
    mysql-test/r/type_blob.result:
      Auto merged
    mysql-test/t/type_blob.test:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    sql/share/english/errmsg.txt:
      Auto merged
    sql/share/russian/errmsg.txt:
      Auto merged
    sql/share/ukrainian/errmsg.txt:
      Auto merged
    017efd21
set_var.cc 85.9 KB