into mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
mysql-test/r/ctype_recoding.result:
Auto merged
mysql-test/t/ctype_recoding.test:
Auto merged
sql/sql_string.cc:
Auto merged
under terms of bug#28875 for better performance.
The change appeared to require more changes in item_cmpfunc.cc,
which is dangerous in 5.0.
Conversion between a latin1 column and an ascii string constant
stopped to work.
mysql-test/r/ctype_recoding.result:
Adding test case.
mysql-test/t/ctype_recoding.test:
Adding test case.
Two character mappings were way off (backtick and tilde were "E"
and "Y"!), and three others were slightly rotated. The first
would cause collisions, and the latter was probably benign.
Now, assign the character mappings exactly to their normal values.
sql/share/charsets/ascii.xml:
Change the character mapping for
"`" to "`" (was "E") and
"[" to "[" (was "\") and
"\" to "\" (was "]") and
"]" to "]" (was "[") and
"~" to "~" (was "Y").
strings/ctype-extra.c:
Generated from charsets directory.
mysql-test/r/ctype_ascii.result:
Add new test file.
Test all combinations of printable letter comparisons for
similarity.
mysql-test/t/ctype_ascii.test:
Add new test file.
Test all combinations of printable letter comparisons for
similarity.
mysql-test/suite/funcs_1/r/innodb__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_func_view.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_trig_03e.result:
Updated result file
mysql-test/suite/funcs_1/r/innodb_views.result:
Updated result file
mysql-test/suite/funcs_1/r/memory__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_func_view.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_trig_03e.result:
Updated result file
mysql-test/suite/funcs_1/r/memory_views.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam__datadict.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_func_view.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_trig_03e.result:
Updated result file
mysql-test/suite/funcs_1/r/myisam_views.result:
Updated result file
mysql-test/suite/funcs_1/views/views_master.inc:
updated test file
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
CMakeLists.txt:
Changes for embedded and Windows
libmysql/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/CMakeLists.txt:
Changes for embedded and Windows
libmysqld/examples/CMakeLists.txt:
Changes for embedded and Windows
mysys/CMakeLists.txt:
Changes for embedded and Windows
regex/CMakeLists.txt:
Changes for embedded and Windows
server-tools/instance-manager/CMakeLists.txt:
Changes for embedded and Windows
sql/CMakeLists.txt:
Changes for embedded and Windows
storage/archive/CMakeLists.txt:
Changes for embedded and Windows
storage/blackhole/CMakeLists.txt:
Changes for embedded and Windows
storage/csv/CMakeLists.txt:
Changes for embedded and Windows
storage/example/CMakeLists.txt:
Changes for embedded and Windows
storage/federated/CMakeLists.txt:
Changes for embedded and Windows
storage/heap/CMakeLists.txt:
Changes for embedded and Windows
storage/innobase/CMakeLists.txt:
Changes for embedded and Windows
storage/myisam/CMakeLists.txt:
Changes for embedded and Windows
storage/myisammrg/CMakeLists.txt:
Changes for embedded and Windows
strings/CMakeLists.txt:
Changes for embedded and Windows
vio/CMakeLists.txt:
Changes for embedded and Windows
win/README:
Changes for embedded and Windows
win/configure.js:
Changes for embedded and Windows
win/mysql_manifest.cmake:
Changes for embedded and Windows
into magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt
sql/field.cc:
Auto merged
sql/time.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_timezone.result:
Auto merged
mysql-test/suite/rpl/t/rpl_timezone.test:
Bug 29536 : merge 5.0-opt -> 5.1-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).
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.
into olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug30219
mysql-test/r/type_bit.result:
Auto merged
mysql-test/t/type_bit.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
BitKeeper/deleted/.del-readme.txt~3:
Auto merged
sql/field.h:
Manual merge.
Previously, UDF *_init functions were passed constant strings with erroneous lengths.
The length came from the containing variable's size, not the length of the value itself.
Now the *_init functions get the constant as a null terminated string with the correct
length supplied.
mysql-test/r/udf.result:
Test case to check constants passed UDFs.
mysql-test/t/udf.test:
Test case to check constants passed UDFs.
sql/item_func.cc:
UDF _init functions are now passed the length of the constants, rather than the max
length of the var containing the constant.
sql/udf_example.c:
Added check_const_len functions. The check_const_len_init functions checks that the
lengths of constants are correctly passed.
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
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.
when its statement being KILLed". The bug itself was fixed by separate
patch in 5.0 tree.
mysql-test/r/lock_multi.result:
Added test for bug #21281 "Pending write lock is incorrectly removed
when its statement being KILLed".
mysql-test/t/lock_multi.test:
Added test for bug #21281 "Pending write lock is incorrectly removed
when its statement being KILLed".
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg21281-2
mysql-test/t/federated.test:
Auto merged
mysys/thr_lock.c:
Auto merged
mysql-test/r/federated.result:
SCCS merged
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.1-opt-merge
mysql-test/include/read_many_rows.inc:
Auto merged
mysql-test/r/events_bugs.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/read_many_rows_innodb.result:
Auto merged
sql/handler.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_rcontext.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_class.h:
Manual merge.
storage/innobase/handler/ha_innodb.cc:
Manual merge.
