• unknown's avatar
    Merge mysql.com:/home/jimw/my/tmp_merge · 9f7548ae
    unknown authored
    into  mysql.com:/home/jimw/my/mysql-5.1-clean
    
    
    mysql-test/r/user_var.result:
      Auto merged
    mysql-test/r/variables.result:
      Auto merged
    mysql-test/t/variables.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    mysql-test/mysql-test-run.pl:
      Resolve conflict
    mysql-test/ndb/ndbcluster.sh:
      Resolve conflict
    sql/set_var.cc:
      Resolve conflict
    sql/share/errmsg.txt:
      Resolve conflict
    9f7548ae
errmsg.txt 348 KB