into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51

into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51

Post-merge fix.  New error ER_NON_INSERTABLE_TABLE put at end of errmsg.txt, means that the error number in 5.1 is 1573, while in 5.0 it is 1471.

into  rama.(none):/home/jimw/my/mysql-5.0-clean

into  rama.(none):/home/jimw/my/mysql-5.1-clean

into  rama.(none):/home/jimw/my/mysql-5.0-clean

into  rama.(none):/home/jimw/my/mysql-4.1-clean

into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51

into  siva.hindu.god:/usr/home/tim/m/bk/mrg/51

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug20778/my51-bug20778

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

into  rama.(none):/home/jimw/my/mysql-5.1-clean

into  rama.(none):/home/jimw/my/mysql-5.0-clean

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  rama.(none):/home/jimw/my/mysql-5.0-clean

into  rama.(none):/home/jimw/my/mysql-5.1-clean

into  rama.(none):/home/jimw/my/mysql-5.0-clean

into  rama.(none):/home/jimw/my/mysql-5.0-clean

  After merge fix

into  moonbone.local:/work/5505-bug-5.0-opt-mysql

On an INSERT into an updatable but non-insertable view an error message was
issued stating the view being not updatable. This can lead to a confusion of a
user.

A new error message is introduced. Is is showed when a user tries to insert
into a non-insertable view.

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug22224/my51-bug22224

  
This change has already been made to 5.1.

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305

into  zim.(none):/home/brian/mysql/merge-5.1