-
unknown authored
into mysql.com:/home/stewart/Documents/MySQL/5.1/new client/mysqltest.c: Auto merged sql/item.cc: Auto merged sql/sql_trigger.cc: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged strings/decimal.c: Auto merged configure.in: remove 5.0 version increement sql/ha_archive.cc: merge sql/handler.cc: merge sql/mysqld.cc: merge
0b9b118b