bzr push into mysql-5.5-merge branch (Georgi.Kodinov:3166 to 3167)

[Georgi Kodinov]

 3167 Georgi Kodinov	2010-08-10 [merge]
      merge

    modified:
      README
 3166 Jon Olav Hauglid	2010-08-09 [merge]
      manual merge from mysql-5.1-bugteam

    modified:
      mysql-test/r/insert.result
      mysql-test/t/insert.test
      sql/sql_insert.cc
      sql/sql_select.cc
      sql/sql_update.cc
=== modified file 'README'
--- a/README	2010-03-04 13:45:11 +0000
+++ b/README	2010-08-10 13:41:53 +0000
@@ -1,4 +1,4 @@
-This is a release of MySQL, a dual-license SQL database server.
+This is a release of MySQL, a dual-license SQL DBMS.
 MySQL is brought to you by the MySQL team at Oracle Corporation.
 
 ************************************************************


Attachment: [text/bzr-bundle] bzr/[e-mail]