• unknown's avatar
    Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0b732c47
    unknown authored
    into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0
    
    
    include/my_sys.h:
      Auto merged
    include/thr_lock.h:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql-common/client.c:
      Auto merged
    client/mysqldump.c:
      Manual merge
    include/mysql.h:
      Manual merge
    libmysql/libmysql.c:
      Manual merge
    myisam/rt_split.c:
      Manual merge
    mysys/thr_lock.c:
      Manual merge
    sql/lock.cc:
      Manual merge
    sql/mysql_priv.h:
      Manual merge
    sql/sql_base.cc:
      Manual merge
    sql/sql_table.cc:
      Manual merge
    tests/mysql_client_test.c:
      Manual merge
    0b732c47
sql_table.cc 122 KB