-
unknown authored
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 mysql-test/r/null.result: Auto merged mysql-test/t/null.test: Auto merged sql/sql_table.cc: Merge.
9111e057
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 mysql-test/r/null.result: Auto merged mysql-test/t/null.test: Auto merged sql/sql_table.cc: Merge.