-
unknown authored
into mysql.com:/usr/home/bar/mysql-5.1-rpl BitKeeper/etc/collapsed: auto-union mysql-test/r/ctype_recoding.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/strict_autoinc_1myisam.result: Auto merged mysql-test/r/strict_autoinc_2innodb.result: Auto merged mysql-test/r/strict_autoinc_3heap.result: Auto merged mysql-test/r/strict_autoinc_4bdb.result: Auto merged mysql-test/r/strict_autoinc_5ndb.result: Auto merged sql/sql_string.cc: Auto merged sql/sql_string.h: Auto merged sql/field.cc: SCCS merged
bfdc9c12