into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

added SUPER_ACL check for I_S.TRIGGERS


mysql-test/r/information_schema.result:
  result fix
mysql-test/r/information_schema_db.result:
  result fix
mysql-test/t/information_schema.test:
  test case
sql/sql_show.cc:
  added SUPER_ACL check for I_S.TRIGGERS

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30396

into  dl145s.mysql.com:/data0/mhansson/my50-bug28570


sql/opt_range.cc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Bug#28570: Manual Merge
mysql-test/t/innodb_mysql.test:
  Bug#28570: Manual Merge

The bug caused memory corruption for some queries with top OR level
in the WHERE condition if they contained equality predicates and 
other sargable predicates in disjunctive parts of the condition.

The corruption happened because the upper bound of the memory
allocated for KEY_FIELD and SARGABLE_PARAM internal structures
containing info about potential lookup keys was calculated incorrectly
in some cases. In particular it was calculated incorrectly when the
WHERE condition was an OR formula with disjuncts being AND formulas
including equalities and other sargable predicates.


mysql-test/r/select.result:
  Added a test case for bug #30396.
mysql-test/t/select.test:
  Added a test case for bug #30396.
sql/item_cmpfunc.h:
  Removed max_members from the COND_EQUAL class as not useful anymore.
sql/sql_base.cc:
  Added the max_equal_elems field to the st_select_lex structure.
sql/sql_lex.cc:
  Added the max_equal_elems field to the st_select_lex structure.
sql/sql_lex.h:
  Added the max_equal_elems field to the st_select_lex structure.
  The field contains the maximal number of elements in multiple equalities
  built for the query conditions.
sql/sql_select.cc:
  Fixed bug #30396.
  The bug caused memory corruption for some queries with top OR level
  in the WHERE condition if they contained equality predicates and 
  other sargable predicates in disjunctive parts of the condition.
  
  The corruption happened because the upper bound of the memory
  allocated for KEY_FIELD and SARGABLE_PARAM internal structures
  containing info about potential lookup keys was calculated incorrectly
  in some cases. In particular it was calculated incorrectly when the
  WHERE condition was an OR formula with disjuncts being AND formulas
  including equalities and other sargable predicates.
   
  The max_equal_elems field to the st_select_lex structure is used now
  to calculate the above mentioned upper bound. The field contains the
  maximal number of elements in multiple equalities built for the query
  conditions.

  Post fix for the bug#29948.


tests/mysql_client_test.c:
  Post fix for the bug#29948.

ORDER BY is used

The range analysis module did not correctly signal to the 
handler that a range represents a ref (EQ_RANGE flag). This causes 
non-range queries like 
SELECT ... FROM ... WHERE keypart_1=const, ..., keypart_n=const 
ORDER BY ... FOR UPDATE
to wait for a lock unneccesarily if another running transaction uses
SELECT ... FOR UPDATE on the same table.

Fixed by setting EQ_RANGE for all range accesses that represent 
an equality predicate. 


mysql-test/r/innodb_mysql.result:
  bug#28570: Test Result
mysql-test/t/innodb_mysql.test:
  bug#28570: Test Case
sql/handler.cc:
  bug#28570: Updated comment
sql/opt_range.cc:
  bug#28570: Removed the criterion that key has to be unique (HA_NOSAME) in 
  order for the EQ_RANGE flag to be set. It is sufficient that the range 
  represent a ref access.

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


tests/mysql_client_test.c:
  Manually merged

The cli_read_binary_rows function is used to fetch data from the server
after a prepared statement execution. It accepts a statement handler and gets
the connection handler from it. But when the auto-reconnect option is set
the connection handler is reset to NULL after reconnection because the
prepared statement is lost and the handler became useless. This case
wasn't checked in the cli_read_binary_rows function and caused server crash.

Now the cli_read_binary_rows function checks the connection handler to be
not NULL and returns an error if it is.


tests/mysql_client_test.c:
  Added a test case for the bug#29948: Unchecked NULL pointer caused server crash.
libmysql/libmysql.c:
  Bug#29948: Unchecked NULL pointer caused server crash.
  Now the cli_read_binary_rows function checks the connection handler to be
  not NULL and returns an error if it is.

into  gleb.loc:/home/uchum/work/bk/5.0-opt

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

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

into  synthia.local:/home/mydev/mysql-4.1-axmrg

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime


mysql-test/r/federated.result:
  Auto merged
mysql-test/t/federated.test:
  Auto merged
sql/item.cc:
  Auto merged

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

MySQL replicates the time zone only when operations that involve
it are performed. This is controlled by a flag. But this flag
is set only on successful operation.
The flag must be set also when there is an error that involves
a timezone (so the master would replicate the error to the slaves). 

Fixed by moving the setting of the flag before the operation
(so it apples to errors as well).


mysql-test/r/rpl_timezone.result:
  Bug #29536: test case
mysql-test/t/rpl_timezone.test:
  Bug #29536: test case
sql/field.cc:
  Bug #29536: move setting of the flag before the operation
  (so it apples to errors as well).
sql/time.cc:
  Bug #29536: move setting of the flag before the operation
  (so it apples to errors as well).

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime

VIEW".

mysql_list_fields() C API function would incorrectly set MYSQL_FIELD::decimals
member for some view columns.

The problem was in an incomplete implementation of 
Item_ident_for_show::make_field(), which is responsible for view
columns metadata.


sql/item.cc:
  A fix for Bug#29306 -- properly initialize decimals in 
  Item_ident_for_show::make_field
tests/mysql_client_test.c:
  Add a test case forBug#29306. Fix warnings.

a problem for BIT type values different from the one reported for the bug.

  Corrected install path


scripts/make_win_bin_dist:
  Corrected install path

  Copy embedded .pdb and static debug lib


scripts/make_win_bin_dist:
  Copy embedded .pdb and static debug lib

  Search "relwithdebinfo" directory in CMake Visual Studio build
  Search for "mysqld-debug" even in source tree


mysql-test/mysql-test-run.pl:
  Search "relwithdebinfo" directory in CMake Visual Studio build
  Search for "mysqld-debug" even in source tree

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30219

This bug manifested itself for queries with grouping by columns of
the BIT type. It led to wrong comparisons of bit-field values and
wrong result sets.
Bit-field values never cannot be compared as binary values. Yet
the class Field_bit had an implementation of the cmp method that
compared bit-fields values as binary values. 
Also the get_image and set_image methods of the base class Field 
cannot be used for objects of the Field_bit class. 
Now these methods are declared as virtual and specific implementations
of the methods are provided for the class Field_bit.


mysql-test/r/type_bit.result:
  Added a test case for bug #30219.
mysql-test/t/type_bit.test:
  Added a test case for bug #30219.
sql/field.h:
  Fix bug #30219.
  This bug manifested itself for queries with grouping by columns of
  the BIT type. It led to wrong comparisons of bit-field values and
  wrong result sets.
  Bit-field values never cannot be compared as binary values. Yet
  the class Field_bit had an implementation of the cmp method that
  compared bit-fields values as binary values.
  Also the get_image and set_image methods of the base class Field
  cannot be used for objects of the Field_bit class. 
  Now these methods are declared as virtual and specific implementations
  of these methods are provided for the class Field_bit.

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build

statement being KILLed".

When statement which was trying to obtain write lock on then table and
which was blocked by existing read lock was killed, concurrent statements
that were trying to obtain read locks on the same table and that were
blocked by the presence of this pending write lock were not woken up and
had to wait until this first read lock goes away.

This problem was caused by the fact that we forgot to wake up threads
which pending requests could have been satisfied after removing lock
request for the killed thread.

The patch solves the problem by waking up those threads in such situation.

Test for this bug will be added to 5.1 only as it has much better
facilities for its implementation. Particularly, by using I_S.PROCESSLIST
and wait_condition.inc script we can wait until thread will be blocked on
certain table lock without relying on unconditional sleep (which usage
increases time needed for test runs and might cause spurious test
failures on slower platforms).


mysys/thr_lock.c:
  After removing lock request from the list of waiting lock requests
  (e.g. when we discover that current thread was killed) we should
  wake up other threads waiting for the same lock which pending
  requests now can be satisfied. To implement this behavior we
  move code responsible for waking up threads which pending requests
  can be satisfied from thr_unlock() to new wake_up_waiters() procedure
  and use it in wait_for_lock() and hr_abort_locks_for_thread().

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-merge


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1

into  mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl

  Removed space between '-D' and symbol


CMakeLists.txt:
  Removed space between '-D' and symbol

  Several adjustments to make client libraries pass the link test
  on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)


win/README:
  - Removed references to PARTITION engine, 5.1 only
win/configure.js:
  - Removed references to PARTITION engine, 5.1 only
extra/CMakeLists.txt:
  Use the special 'debug' list element to mark that "dbug" library
  is only to be linked against if build type "Debug".
myisam/CMakeLists.txt:
  Use the special 'debug' list element to mark that "dbug" library
  is only to be linked against if build type "Debug".
scripts/CMakeLists.txt:
  Use the special 'debug' list element to mark that "dbug" library
  is only to be linked against if build type "Debug".
server-tools/instance-manager/CMakeLists.txt:
  Use the special 'debug' list element to mark that "dbug" library
  is only to be linked against if build type "Debug".
sql/CMakeLists.txt:
  Use the special 'debug' list element to mark that "dbug" library
  is only to be linked against if build type "Debug".
mysys/CMakeLists.txt:
  Restored include path to "mysys" itself
dbug/CMakeLists.txt:
  Changed to optionally be included to give a file list only
extra/yassl/CMakeLists.txt:
  Changed to optionally be included to give a file list only
extra/yassl/taocrypt/CMakeLists.txt:
  Changed to optionally be included to give a file list only
zlib/CMakeLists.txt:
  Changed to optionally be included to give a file list only
libmysql/CMakeLists.txt:
  For compatibility with Visual Studio 2005, list all files that are to
  be part of the library build, i.e. libraries can't be built from other
  libraries. Set SOURCE_SUBLIBS and include the file listings from
  "zlib", "dbug", "taocrypt" and "yassl"

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team


mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

  Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble


BitKeeper/deleted/.del-readme.txt-grumble-grumble:
  Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble

A test case was waiting for a fixed number of seconds for a specific 
state of the slave IO thread to take place.
Fixed by waiting in a loop for that specific thread state instead 
(or timeout).


mysql-test/t/rpl_relayspace.test:
  Bug #25228: fixed test case

into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
strings/conf_to_src.c:
  Auto merged
strings/ctype-extra.c:
  Auto merged
mysql-test/r/ctype_ucs.result:
  After merge fix
mysql-test/t/ctype_ucs.test:
  After merge fix