Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/cps/mysql/devel/innotask/mysql-5.0-inno-final

VC++Files/libmysqld/libmysqld.dsp

@@ -544,6 +544,10 @@ SOURCE=..\sql\sql_test.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\sql\sql_trigger.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\sql_udf.cpp
 # End Source File
 # Begin Source File

VC++Files/sql/mysqld.dsp

@@ -1779,6 +1779,10 @@ SOURCE=.\sql_test.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\sql_trigger.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\sql_udf.cpp
 # End Source File
 # Begin Source File