BitKeeper/etc/logging_ok:
auto-union
sql/item_func.cc:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/nt_servc.cc:
Auto merged
configure.in:
Use local version
innobase/os/os0file.c:
Use local version
innobase/page/page0page.c:
Use local version
innobase/row/row0sel.c:
Use local version
innobase/row/row0vers.c:
Use local version
mysql-test/r/order_by.result:
Use local version
mysql-test/r/user_var.result:
merge with 3.23
mysql-test/t/order_by.test:
Use local version (test is already in range.test)
sql/log.cc:
Use local version
sql/share/spanish/errmsg.txt:
merge
sql/slave.cc:
Use local version
sql/sql_class.h:
Use local version
sql/sql_select.cc:
Use patch in 4.0 for range with NULL problem
