mysql-test/r/sp.result:
  Manual merge.
  - lowercase 'default' changes to uppercase 'DEFAULT'
sql/item_func.cc:
  Manual merge
  - shared tables is handled differently in 5.1.
  - Use of LEX_STRING instead of char*.
  - Dummy table allocated differently.