• unknown's avatar
    Merge polly.local:/tmp/20924/bug20294/my50-bug20294 · 90792d4c
    unknown authored
    into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
    
    
    sql/item_cmpfunc.cc:
      Auto merged
    sql/item_cmpfunc.h:
      Auto merged
    sql/sql_class.h:
      Auto merged
    mysql-test/r/user_var.result:
      Manual merge
    mysql-test/t/user_var.test:
      Manual merge
    sql/item_func.cc:
      Manual merge
    sql/item_func.h:
      Manual merge
    90792d4c
user_var.result 8.11 KB