Skip to content
Commit 463e9409 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.1-opt 

into  mysql.com:/home/hf/work/8663/my51-8663


mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/item_func.cc:
  Auto merged
parents c8ac3b7c 13245571
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment