• unknown's avatar
    Merge mysql.com:/opt/local/work/mysql-4.1-root · 61e454c0
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.0-root
    
    
    mysql-test/r/ndb_alter_table.result:
      Auto merged
    mysql-test/r/ndb_basic.result:
      Auto merged
    mysql-test/t/select.test:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/table.cc:
      Auto merged
    vio/vio.c:
      Auto merged
    vio/viossl.c:
      Auto merged
    include/my_base.h:
      Manual merge.
    mysql-test/r/ps.result:
      Manual merge.
    mysql-test/r/select.result:
      Manual merge.
    mysql-test/t/ndb_alter_table.test:
      Manual merge.
    mysql-test/t/ndb_basic.test:
      Manual merge.
    mysql-test/t/ps.test:
      Manual merge.
    sql-common/client.c:
      k	
    sql/ha_ndbcluster.cc:
      Manual merge.
    sql/item.cc:
      Manual merge.
    sql/sql_table.cc:
      Manual merge.
    61e454c0
item.cc 159 KB