into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.0-bug24985


sql/ha_myisam.cc:
  Auto merged
mysql-test/r/heap_btree.result:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge

            causes incorrect duplicate entries
After merge fix

into  chilla.local:/home/mydev/mysql-5.0-bug24985


mysql-test/r/heap_btree.result:
  Auto merged
sql/ha_heap.cc:
  Auto merged
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Manual merge from 4.1

            causes incorrect duplicate entries

Keys for BTREE indexes on ENUM and SET columns of MEMORY tables
with character set UTF8 were computed incorrectly. Many
different column values got the same key value.

Apart of possible performance problems, it made unique indexes
of this type unusable because it rejected many different
values as duplicates.

The problem was that multibyte character detection was tried
on the internal numeric column value. Many values were not
identified as characters. Their key value became blank filled.

Thanks to Alexander Barkov and Ramil Kalimullin for the patch,
which sets the character set of ENUM and SET key segments to
the pseudo binary character set.


mysql-test/r/heap_btree.result:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Added test result.
mysql-test/t/heap_btree.test:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Added test.
sql/ha_heap.cc:
  Bug#24985 - UTF8 ENUM primary key on MEMORY using BTREE
              causes incorrect duplicate entries
  Set key segment charset to my_charset_bin for ENUM and SET
  columns.

into  chilla.local:/home/mydev/mysql-5.0--team


sql/ha_myisam.cc:
  Auto merged

into  chilla.local:/home/mydev/mysql-5.0--main


sql/ha_ndbcluster.cc:
  Auto merged

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


sql/mysqld.cc:
  Auto merged

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

fixed differently: wake up select_thread with THR_SERVER_ALARM instead


mysys/thr_alarm.c:
  reverted linuxthreads thr_client_alarm fix (not future-proof)

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  SCCS merged

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1


mysys/thr_alarm.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1


sql/mysqld.cc:
  merged

(in thr_alarm.cc it happened too late).


mysys/thr_alarm.c:
  move thr_client_alarm initialization to mysqld.cc
  (here it happened too late)
sql/mysqld.cc:
  move thr_client_alarm initialization to mysqld.cc
  (in thr_alarm.cc it happened too late).
  moved thr_kill_signal initialization to init_signals()

into  trift2.:/MySQL/M50/push-5.0


sql/sql_class.cc:
  Auto merged

into  trift2.:/MySQL/M50/push-5.0


mysql-test/mysql-test-run.pl:
  Auto merged

into  linux.site:/home/omer/source/bld50_0321

into  chilla.local:/home/mydev/mysql-5.0-bug26996


heap/hp_write.c:
  Auto merged

into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql

  Post-fix for bug#26813.


sql/sql_view.cc:
  Post-fix for bug#26813.

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


sql/item_cmpfunc.cc:
  Auto merged

into  mysql.com:/home/hf/work/mrg/mysql-4.1-opt

into  moonbone.local:/mnt/gentoo64/work/26813-bug-5.0-opt-mysql

another user.

When the DEFINER clause isn't specified in the ALTER statement then it's loaded
from the view definition. If the definer differs from the current user then
the error is thrown because only a super-user can set other users as a definers.

Now if the DEFINER clause is omitted in the ALTER VIEW statement then the
definer from the original view is used without check.


mysql-test/t/view_grant.test:
  Added a test case for the bug#27006: The SUPER privilege is wrongly required
  to alter a view created by another user.
mysql-test/r/view_grant.result:
  Added a test case for the bug#27006: The SUPER privilege is wrongly required
  to alter a view created by another user.
sql/sql_view.cc:
  Bug#26813: The SUPER privilege is wrongly required to alter a view created by
  another user.
  Now if the DEFINER clause is omitted in the ALTER VIEW statement then the
  definer from the original view is used without check.

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


BitKeeper/deleted/.del-fill_func_tables.sh:
  Auto merged
BitKeeper/deleted/.del-fill_help_tables.sh:
  Auto merged

  Delete: scripts/fill_func_tables.sh
.del-fill_help_tables.sh:
  Delete: scripts/fill_help_tables.sh
.del-internals.texi:
  Delete: Docs/internals.texi


BitKeeper/deleted/.del-internals.texi:
  Delete: Docs/internals.texi
BitKeeper/deleted/.del-fill_func_tables.sh:
  Delete: scripts/fill_func_tables.sh
BitKeeper/deleted/.del-fill_help_tables.sh:
  Delete: scripts/fill_help_tables.sh

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


BitKeeper/deleted/.del-colspec-fix.pl:
  Auto merged
BitKeeper/deleted/.del-docbook-fixup.pl:
  Auto merged
BitKeeper/deleted/.del-docbook-prefix.pl:
  Auto merged
BitKeeper/deleted/.del-docbook-split:
  Auto merged
BitKeeper/deleted/.del-make-docbook:
  Auto merged
BitKeeper/deleted/.del-make-makefile:
  Auto merged
BitKeeper/deleted/.del-test-make-manual-de:
  Auto merged
BitKeeper/deleted/.del-test-make-manual:
  Auto merged
BitKeeper/deleted/.del-xwf:
  Auto merged

into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build


BitKeeper/deleted/.del-net_doc.txt:
  Auto merged

  Docs/Books/
  Docs/MySQL-logos/
Deleted files
  Docs/Tutorial-MySQL-final.txt
  Docs/bk.txt
  Docs/Support/.cvsignore
  Docs/Support/colspec-fix.pl
  Docs/Support/docbook-fixup.pl
  Docs/Support/docbook-prefix.pl
  Docs/Support/docbook-split
  Docs/Support/make-docbook
  Docs/Support/make-makefile
  Docs/Support/test-make-manual
  Docs/Support/test-make-manual-de
  Docs/Support/trivial-makeinfo-4.0c.patch
  Docs/Support/xwf
Deleted file now in internals main text
  Docs/my_sys.txt
Deleted file now in internals svn tree
  Docs/net_doc.txt
Removed obsolete entries
  Docs/.cvsignore
Added note that info is obsolete
  Docs/linuxthreads.txt


BitKeeper/deleted/.del-colspec-fix.pl:
  Delete: Docs/Support/colspec-fix.pl
BitKeeper/deleted/.del-docbook-fixup.pl:
  Delete: Docs/Support/docbook-fixup.pl
BitKeeper/deleted/.del-docbook-prefix.pl:
  Delete: Docs/Support/docbook-prefix.pl
BitKeeper/deleted/.del-docbook-split:
  Delete: Docs/Support/docbook-split
BitKeeper/deleted/.del-make-docbook:
  Delete: Docs/Support/make-docbook
BitKeeper/deleted/.del-make-makefile:
  Delete: Docs/Support/make-makefile
BitKeeper/deleted/.del-test-make-manual-de:
  Delete: Docs/Support/test-make-manual-de
BitKeeper/deleted/.del-test-make-manual:
  Delete: Docs/Support/test-make-manual
BitKeeper/deleted/.del-trivial-makeinfo-4.0c.patch:
  Delete: Docs/Support/trivial-makeinfo-4.0c.patch
BitKeeper/deleted/.del-xwf:
  Delete: Docs/Support/xwf
BitKeeper/deleted/.del-algor.eps~1a57aff065918206:
  Delete: Docs/Books/algor.eps
BitKeeper/deleted/.del-algor.gif:
  Delete: Docs/Books/algor.gif
BitKeeper/deleted/.del-algor.txt:
  Delete: Docs/Books/algor.txt
BitKeeper/deleted/.del-dbi.eps~7b1032f98de7736d:
  Delete: Docs/Books/dbi.eps
BitKeeper/deleted/.del-dbi.gif:
  Delete: Docs/Books/dbi.gif
BitKeeper/deleted/.del-dbi.txt:
  Delete: Docs/Books/dbi.txt
BitKeeper/deleted/.del-dubois.eps~f24e09a7fa420436:
  Delete: Docs/Books/dubois.eps
BitKeeper/deleted/.del-dubois.gif:
  Delete: Docs/Books/dubois.gif
BitKeeper/deleted/.del-dubois.txt:
  Delete: Docs/Books/dubois.txt
BitKeeper/deleted/.del-ecomm.eps~17833026ebd7656:
  Delete: Docs/Books/ecomm.eps
BitKeeper/deleted/.del-ecomm.gif:
  Delete: Docs/Books/ecomm.gif
BitKeeper/deleted/.del-ecomm.txt:
  Delete: Docs/Books/ecomm.txt
BitKeeper/deleted/.del-in_21.eps~8150d06653dab178:
  Delete: Docs/Books/in_21.eps
BitKeeper/deleted/.del-in_21.gif:
  Delete: Docs/Books/in_21.gif
BitKeeper/deleted/.del-in_21.txt:
  Delete: Docs/Books/in_21.txt
BitKeeper/deleted/.del-manual.eps~1c2ebcea50b4840c:
  Delete: Docs/Books/manual.eps
BitKeeper/deleted/.del-manual.gif:
  Delete: Docs/Books/manual.gif
BitKeeper/deleted/.del-manual.txt:
  Delete: Docs/Books/manual.txt
BitKeeper/deleted/.del-msql.eps~f3801b9d166ae4fc:
  Delete: Docs/Books/msql.eps
BitKeeper/deleted/.del-msql.gif:
  Delete: Docs/Books/msql.gif
BitKeeper/deleted/.del-msql.txt:
  Delete: Docs/Books/msql.txt
BitKeeper/deleted/.del-prof.eps~1f54d9a56eb2b908:
  Delete: Docs/Books/prof.eps
BitKeeper/deleted/.del-prof.gif:
  Delete: Docs/Books/prof.gif
BitKeeper/deleted/.del-prof.txt:
  Delete: Docs/Books/prof.txt
BitKeeper/deleted/.del-pthreads.eps~2ca8ff2d1181b2c0:
  Delete: Docs/Books/pthreads.eps
BitKeeper/deleted/.del-pthreads.gif:
  Delete: Docs/Books/pthreads.gif
BitKeeper/deleted/.del-pthreads.txt:
  Delete: Docs/Books/pthreads.txt
BitKeeper/deleted/.del-realmen.eps~cc022325d3cb045:
  Delete: Docs/Books/realmen.eps
BitKeeper/deleted/.del-realmen.gif:
  Delete: Docs/Books/realmen.gif
BitKeeper/deleted/.del-realmen.txt:
  Delete: Docs/Books/realmen.txt
BitKeeper/deleted/.del-sql-99.eps~f85c06de7a016c7d:
  Delete: Docs/Books/sql-99.eps
BitKeeper/deleted/.del-sql-99.gif:
  Delete: Docs/Books/sql-99.gif
BitKeeper/deleted/.del-sql-99.txt:
  Delete: Docs/Books/sql-99.txt
BitKeeper/deleted/.del-mysql-01.gif:
  Delete: Docs/MySQL-logos/mysql-01.gif
BitKeeper/deleted/.del-mysql-02.gif:
  Delete: Docs/MySQL-logos/mysql-02.gif
BitKeeper/deleted/.del-mysql-03.gif:
  Delete: Docs/MySQL-logos/mysql-03.gif
BitKeeper/deleted/.del-mysql-04.gif:
  Delete: Docs/MySQL-logos/mysql-04.gif
BitKeeper/deleted/.del-mysql-05.gif:
  Delete: Docs/MySQL-logos/mysql-05.gif
BitKeeper/deleted/.del-mysql-06.gif:
  Delete: Docs/MySQL-logos/mysql-06.gif
BitKeeper/deleted/.del-mysql-07.gif:
  Delete: Docs/MySQL-logos/mysql-07.gif
BitKeeper/deleted/.del-mysql-08.gif:
  Delete: Docs/MySQL-logos/mysql-08.gif
BitKeeper/deleted/.del-mysql-09.gif:
  Delete: Docs/MySQL-logos/mysql-09.gif
BitKeeper/deleted/.del-mysql-10.gif:
  Delete: Docs/MySQL-logos/mysql-10.gif
BitKeeper/deleted/.del-mysql-11.gif:
  Delete: Docs/MySQL-logos/mysql-11.gif
BitKeeper/deleted/.del-mysql-12.gif:
  Delete: Docs/MySQL-logos/mysql-12.gif
BitKeeper/deleted/.del-mysql-13.gif:
  Delete: Docs/MySQL-logos/mysql-13.gif
BitKeeper/deleted/.del-mysql-14.gif:
  Delete: Docs/MySQL-logos/mysql-14.gif
BitKeeper/deleted/.del-mysql-15.gif:
  Delete: Docs/MySQL-logos/mysql-15.gif
BitKeeper/deleted/.del-mysql-16.gif:
  Delete: Docs/MySQL-logos/mysql-16.gif
BitKeeper/deleted/.del-mysql-17.gif:
  Delete: Docs/MySQL-logos/mysql-17.gif
BitKeeper/deleted/.del-mysql-compatible.jpg:
  Delete: Docs/MySQL-logos/mysql-compatible.jpg
BitKeeper/deleted/.del-mysql_anim-01.gif:
  Delete: Docs/MySQL-logos/mysql_anim-01.gif
BitKeeper/deleted/.del-mysql_anim-02.gif:
  Delete: Docs/MySQL-logos/mysql_anim-02.gif
BitKeeper/deleted/.del-mysql_anim-03.gif:
  Delete: Docs/MySQL-logos/mysql_anim-03.gif
BitKeeper/deleted/.del-mysql_anim-04.gif:
  Delete: Docs/MySQL-logos/mysql_anim-04.gif
BitKeeper/deleted/.del-mysql_anim-05.gif:
  Delete: Docs/MySQL-logos/mysql_anim-05.gif
BitKeeper/deleted/.del-mysql_anim-06.gif:
  Delete: Docs/MySQL-logos/mysql_anim-06.gif
BitKeeper/deleted/.del-Tutorial-MySQL-final.txt:
  Delete: Docs/Tutorial-MySQL-final.txt
BitKeeper/deleted/.del-net_doc.txt:
  Delete: Docs/net_doc.txt
BitKeeper/deleted/.del-my_sys.txt:
  Delete: Docs/my_sys.txt
BitKeeper/deleted/.del-bk.txt:
  Delete: Docs/bk.txt
BitKeeper/deleted/.del-.cvsignore:
  Delete: Docs/Support/.cvsignore
Docs/.cvsignore:
  Removed obsolete entries
Docs/linuxthreads.txt:
  Added note info is obsolete

into  magare.gmz:/home/kgeorge/mysql/autopush/B26207-5.0-opt


sql/sql_select.h:
  Auto merged

 in index search MySQL was not explicitly
 suppressing warnings. And if the context 
 happens to enable warnings (e.g. INSERT ..
 SELECT) the warnings resulting from converting 
 the data the key is compared to are 
 reported to the client.
 Fixed by suppressing warnings when converting
 the data to the same type as the key parts.


mysql-test/r/insert_select.result:
  Bug #26207: test case
mysql-test/t/insert_select.test:
  Bug #26207: test case
sql/sql_select.h:
  Bug #26207: supress warnings when converting
    data of the same type to key buffer format.

  Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO


extra/yassl/taocrypt/benchmark/Makefile.am:
  Don't install benchmark executable
CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
mysys/CMakeLists.txt:
  Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO