into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint

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


include/my_global.h:
  Auto merged

include/my_global.h:
  Change __cplusplus__ to __cplusplus in #define __attribute__(A) macro

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


include/my_global.h:
  Auto merged

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


include/my_global.h:
  Auto merged

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.


mysql-test/r/ctype_ucs.result:
  Post-merge fix
mysql-test/r/ctype_utf8.result:
  Post-merge fix
mysql-test/t/ctype_utf8.test:
  Post-merge fix
mysql-test/t/view.test:
  Post-merge fix

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


include/my_global.h:
  Auto merged

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


include/my_global.h:
  Auto merged

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


include/my_global.h:
  Auto merged

include/my_global.h:
  Disable __attribute__ on g++ < 3.4. There are actually some forms of it that
  are supported, but rather than create more ATTRIBUTE_<foo> macros to handle
  them, it is easier to just disable them all. We will catch the compiler warnings
  with more recent versions of g++.

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

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


include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/func_group.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge (use local)
mysql-test/t/ctype_utf8.test:
  Manual merge (use local)
mysql-test/r/ps.result:
  Manual merge
sql/share/errmsg.txt:
  Manual merge
sql/unireg.cc:
  Manual merge

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


include/mysql_com.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/handler/ha_innodb.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge (use local)

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


sql/mysql_priv.h:
  Auto merged

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


mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
sql/field.cc:
  Auto merged

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

mysql-test/r/partition.result:
  Altered results after errmsg update.

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


include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Resolve conflict
sql/set_var.cc:
  Resolve conflict
sql/slave.h:
  Resolve conflict
sql/sql_class.h:
  Resolve conflict

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


include/my_global.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

include/my_sys.h:
  Fix bad merge
sql/set_var.cc:
  Fix bad __attribute__ usage.

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

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


include/m_ctype.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_class.h:
  Auto merged
include/my_sys.h:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/mysqld.cc:
  Resolve conflict
sql/opt_range.cc:
  Resolve conflict
sql/sql_acl.cc:
  Resolve conflict

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


mysql-test/t/view.test:
  After merge fix

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


sql/share/errmsg.txt:
  Auto merged
sql/sql_base.cc:
  Auto merged
mysql-test/r/view.result:
  Manual merge
mysql-test/t/view.test:
  Manual merge

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.


sql/sql_base.cc:
  Fixed bug#5505: Wrong error message on INSERT into a view
  The update_non_unique_table_error() function now issues proper
  error for an INSERT.
sql/sql_insert.cc:
  Fixed bug#5505: Wrong error message on INSERT into a view
  Issue the ER_NON_INSERTABLE_TABLE error instead of the 
  ER_NON_UPDATABLE_TABLE on insert into a view.
sql/sql_view.cc:
  Fixed bug#5505: Wrong error message on INSERT into a view
  Issue the ER_NON_INSERTABLE_TABLE error instead of the
  ER_NON_UPDATABLE_TABLE on insert into a view.
mysql-test/r/view.result:
  Added the test case for bug#5505: Wrong error message on INSERT into a view
  Corrected a few test cases after fixing bug#5505
mysql-test/t/view.test:
  Added the test case for bug#5505: Wrong error message on INSERT into a view
  Corrected a few test cases after fixing bug#5505
sql/share/errmsg.txt:
  Fixed bug#5505: Wrong error message on INSERT into a view
  Added the ER_NON_INSERTABLE_TABLE error definition.

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

mysql-test/r/ctype_utf8.result:
  Removed test that should have been reverted with gluh's reversion of 
  B-g#21432.
mysql-test/t/ctype_utf8.test:
  Removed test that should have been reverted with gluh's reversion of 
  B-g#21432.

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

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


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Null Merge
storage/innobase/include/univ.i:
  Null Merge