unknown a5a9b98054 Merge polly.local:/tmp/20924/bug20294/my50-bug20294 ...

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

2006-09-13 16:06:59 +04:00

6.1 KiB

Raw Blame History

View Raw