- Backport to 5.0, use --local-load to instruct myqlbinlog where to
put the files it generate
mysql-test/mysql-test-run.pl:
Make mysqlbinlog use the designated tmpdir for it's LOAD DATA files
Problem was that mysql_create_view did not remove all comments characters
when writing to binlog, resulting in parse error of stmt on slave side.
Solution was to use the recreated select clause
and add a generated CHECK OPTION clause if needed.
mysql-test/r/rpl_sp.result:
Bug#32575 - Parse error of stmt with extended comments on slave side
Updated test result
mysql-test/r/rpl_view.result:
Bug#32575 - Parse error of stmt with extended comments on slave side
Updated test result
mysql-test/t/rpl_view.test:
Bug#32575 - Parse error of stmt with extended comments on slave side
Added test case
sql/sql_view.cc:
Bug#32575 - Parse error of stmt with extended comments on slave side
Problem was that mysql_create_view did not remove all comments characters
when writing to binlog, resulting in parse error of stmt on slave side.
Solution was to use the recreated select clause and generate
'WITH {LOCAL|CASCADED} CHECK OPTION'.
or incorrect.
For better conformance with standard, truncation procedure of CHAR columns
has been changed to ignore truncation of trailing whitespace characters
(note has been removed).
Finally, for columns with non-binary charsets:
1. CHAR(N) columns silently ignore trailing whitespace truncation;
2. VARCHAR and TEXT columns issue Note about truncation.
BLOBs and other columns with BINARY charset are unaffected.
mysql-test/r/bdb.result:
Rollback of bug #30059 fix.
mysql-test/r/heap.result:
Rollback of bug #30059 fix.
mysql-test/r/innodb.result:
Rollback of bug #30059 fix.
mysql-test/r/myisam.result:
Rollback of bug #30059 fix.
mysql-test/r/strict.result:
Rollback of bug #30059 fix.
mysql-test/r/type_binary.result:
Rollback of bug #30059 fix.
mysql-test/r/warnings.result:
Updated test case for bug #30059.
sql/field.cc:
Post-commit fix for bug #30059.
The Field_longstr::report_if_important_data method
has been changed to notify about trailing spaces only if
the new count_spaces parameter is TRUE.
The Field_string::store method has been changed to
ignore trailing whitespace truncation (CHAR column
type).
sql/field.h:
Post-commit fix for bug #30059.
The Field_longstr::report_if_important_data method declaration
has been changed to accept extra parameter: bool count_spaces.
We could allocate chunks larger than 4GB, but did our size-accounting in 32-bit
values. This could lead to spurious warnings, inaccurate accounting, and, in
theory, data loss.
Affected: 64-bit platforms. Debug-build (with safemalloc). At least one buffer
larger than 4GB. For potential data loss, a re-alloc on such a buffer would be
necessary.
mysys/my_static.c:
Make memory-accounting 64-bit safe.
mysys/my_static.h:
Make memory-accounting 64-bit safe.
Move in struct for better alignment when 64-bit.
client/mysql_upgrade.c:
Add --tmpdir option to mysql_upgrade and use it when creating temporary files.
mysql-test/mysql-test-run.pl:
Pass --tmpdir to mysql_upgrade
- Code in DbugParse was reading from beyond end of the control string
dbug/dbug.c:
Don't try to parse control strings that hasn't got any tokens
or is zero size
Bug#36028 - Test funcs_1.<engine>_trig_03e failing on Windows
Bug#36029 - Test funcs_1.<engine>_trig_0407 failing on Windows
Bug#36030 - Test funcs_1.<engine>_trig_08 failing on Windows
Adding $MASTER_MYSOCK to init_win_path()
When path names are short, master.sock ends up in MYSQL_TMP_DIR, but with longer path names,
master.sock ends up in /tmp/<random_string>/ and these tests will fail due to path delimiter difference.
New changeset to start with 5.0 -- Not all of these tests are present in 5.0, but want to keep mysqltest the same
The bug is a regression introduced by the patch for bug32798.
The code in Item_func_group_concat::clear() relied on the 'distinct'
variable to check if 'unique_filter' was initialized. That, however,
is not always valid because Item_func_group_concat::setup() can do
shortcuts in some cases w/o initializing 'unique_filter'.
Fixed by checking the value of 'unique_filter' instead of 'distinct'
before dereferencing.
mysql-test/r/func_gconcat.result:
Added test cases for bugs #35298 and #36024.
mysql-test/t/func_gconcat.test:
Added test cases for bugs #35298 and #36024.
sql/item_sum.cc:
Check if unique_filter != NULL before dereferencing it. Non-zero value
of distinct does not always mean that unique_filter is initialized
because Item_func_group_concat::setup() can do shortcuts is some cases
When a zero length is provided to the my_decimal_length_to_precision
function along with unsigned_flag set to false it returns a negative value.
For queries that employs temporary tables may cause failed assertion or
excessive memory consumption while temporary table creation.
Now the my_decimal_length_to_precision and the my_decimal_precision_to_length
functions take unsigned_flag into account only if the length/precision
argument is non-zero.
mysql-test/t/type_decimal.test:
Added a test case for the bug#36023: Incorrect handling of zero length caused
an assertion to fail.
mysql-test/r/type_decimal.result:
Added a test case for the bug#36023: Incorrect handling of zero length caused
an assertion to fail.
sql/my_decimal.h:
Bug#36023: Incorrect handling of zero length caused an assertion to fail.
Now the my_decimal_length_to_precision and the my_decimal_precision_to_length
functions take unsigned_flag into account only if the length/precision
argument is non-zero.
Fix for
Bug#35335 funcs_1: Some tests fail within load_file during
pushbuild runs
Solution: 1. Move files with input data used in load_file,
load data etc.
from suite/funcs_1/<whatever>
to std_data
2. Use for testsuite funcs_1 the server option
--secure-file-priv=<MYSQLTEST_VARDIR>
3. Outfiles have to be stored under MYSQLTEST_VARDIR
+ changes according to WL#4304 Cleanup in funcs_1 tests
- backport of fixes/improvements made in 5.1 to 5.0
The differences between scripts in 5.0 and 5.1 cause
much additional and annoying work during any upmerge.
- replace error numbers with names
- improved comments
- improved formatting
- Unify storage engine names so that result files for
storage engine variants do not differ (some tests)
- remove a script no more used (tests are done in other scripts)
BUILD/Makefile.am:
Test case adjustments
mysql-test/Makefile.am:
Test case adjustments
mysql-test/mysql-test-run.pl:
Test case adjustments
mysql-test/suite/funcs_1/README.txt:
Test case adjustments
mysql-test/suite/funcs_1/datadict/datadict_bug_12777.inc:
Test case adjustments
mysql-test/suite/funcs_1/datadict/datadict_load.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/innodb_tb1.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/innodb_tb2.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/innodb_tb3.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/innodb_tb4.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/memory_tb1.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/memory_tb2.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/memory_tb3.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/memory_tb4.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/myisam_tb1.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/myisam_tb2.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/myisam_tb3.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/myisam_tb4.inc:
Test case adjustments
mysql-test/suite/funcs_1/include/sp_tb.inc:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_func_view.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_02.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_03.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_07.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_08.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_storedproc_10.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_0102.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_03.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_0407.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_08.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_09.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_trig_frkey.result:
Test case adjustments
mysql-test/suite/funcs_1/r/innodb_views.result:
Test case adjustments
mysql-test/suite/funcs_1/r/is_columns_innodb.result:
Test case adjustments
mysql-test/suite/funcs_1/r/is_columns_memory.result:
Test case adjustments
mysql-test/suite/funcs_1/r/is_columns_myisam.result:
Test case adjustments
mysql-test/suite/funcs_1/r/is_columns_ndb.result:
Test case adjustments
mysql-test/suite/funcs_1/r/is_tables_innodb.result:
Test case adjustments
mysql-test/suite/funcs_1/r/is_tables_memory.result:
Test case adjustments
mysql-test/suite/funcs_1/r/is_tables_myisam.result:
Test case adjustments
mysql-test/suite/funcs_1/r/is_tables_ndb.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_func_view.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_02.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_03.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_07.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_08.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_storedproc_10.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_0102.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_03.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_0407.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_08.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_09.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_trig_1011ext.result:
Test case adjustments
mysql-test/suite/funcs_1/r/memory_views.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_func_view.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_02.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_03.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_07.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_08.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_storedproc_10.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_0102.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_03.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_0407.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_08.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_09.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result:
Test case adjustments
mysql-test/suite/funcs_1/r/myisam_views.result:
Test case adjustments
mysql-test/suite/funcs_1/storedproc/cleanup_sp_tb.inc:
Test case adjustments
mysql-test/suite/funcs_1/storedproc/load_sp_tb.inc:
Test case adjustments
mysql-test/suite/funcs_1/storedproc/storedproc_02.inc:
Test case adjustments
mysql-test/suite/funcs_1/storedproc/storedproc_03.inc:
Test case adjustments
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
Test case adjustments
mysql-test/suite/funcs_1/storedproc/storedproc_10.inc:
Test case adjustments
mysql-test/suite/funcs_1/t/innodb_trig_0407.test:
Test case adjustments
mysql-test/suite/funcs_1/t/is_basics_mixed.test:
Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_02.test:
Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_03.test:
Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_06.test:
Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_07.test:
Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_08.test:
Test case adjustments
mysql-test/suite/funcs_1/t/memory_storedproc_10.test:
Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_02.test:
Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_03.test:
Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_06.test:
Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_07.test:
Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_08.test:
Test case adjustments
mysql-test/suite/funcs_1/t/myisam_storedproc_10.test:
Test case adjustments
mysql-test/suite/funcs_1/triggers/trig_frkey2.inc:
Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_0102.inc:
Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_03.inc:
Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_0407.inc:
Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_08.inc:
Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_09.inc:
Test case adjustments
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc:
Test case adjustments
mysql-test/suite/funcs_1/views/func_view.inc:
Test case adjustments
mysql-test/suite/funcs_1/views/views_master.inc:
Test case adjustments
Post-commit minor cleanup of testcase (bug#36139).
mysql-test/r/subselect.result:
Post-commit minor cleanup of testcase (bug#36139).
mysql-test/t/subselect.test:
Post-commit minor cleanup of testcase (bug#36139).
impossible WHERE/HAVING clause
(subselect_single_select_engine::exec).
Allocation and initialization of joined table list t1, t2... of
subqueries like:
NOT IN (SELECT ... FROM t1,t2,... WHERE 0)
is optimized out, however server tries to traverse this list.
mysql-test/r/subselect3.result:
Added test case for bug#36005.
mysql-test/t/subselect3.test:
Added test case for bug#36005.
sql/sql_select.cc:
Fixed bug#36005.
1. JOIN::prepare initializes JOIN::table counter (actually a size
of the JOIN::join_tab array) and sets it to a number of joined tables.
2. The make_join_statistics function (when called from JOIN::optimize)
allocates and fills the JOIN::join_tab array.
However, when optimizing subselect has impossible (definite false)
WHERE or HAVING clause, optimizer skips call to make_join_statistics
and leaves JOIN::join_tab == NULL.
3. subselect_single_select_engine::exec does traversal of the JOIN::join_tab
array and the server dies because array is not allocated but array
counter is greater than 0.
The JOIN::optimize method has been modified to reset the JOIN::table
counter to 0 in cause of impossible WHERE/HAVING clause.
Grouping or ordering of long values in not indexed BLOB/TEXT columns
with GBK or BIG5 charsets crashes the server.
MySQL server uses sorting (the filesort procedure) in the temporary
table to evaluate the GROUP BY clause in case of lack of suitable index.
That procedure takes into account only first @max_sort_length bytes
(system variable, usually 1024) of TEXT/BLOB sorting key string.
The my_strnxfrm_gbk and my_strnxfrm_big5 fill temporary keys
with data of whole blob length instead of @max_sort_length bytes
length. That buffer overrun has been fixed.
mysql-test/r/ctype_gbk.result:
Added test case for bug #35993.
mysql-test/t/ctype_gbk.test:
Added test case for bug #35993.
strings/ctype-big5.c:
Fixed bug #35993: memory corruption and crash with multibyte conversion.
Buffer overrun has been fixed in the my_strnxfrm_big5 function.
strings/ctype-gbk.c:
Fixed bug #35993: memory corruption and crash with multibyte conversion.
Buffer overrun has been fixed in the my_strnxfrm_gbk function.
- Make convert_zerofill_number_to_string() take into account that the
constant it is converting may evaluate to NULL.
mysql-test/r/subselect.result:
BUG#36139 "float, zerofill, crash with subquery"
- Testcase
mysql-test/t/subselect.test:
BUG#36139 "float, zerofill, crash with subquery"
- Testcase
Include several "BUILD/compile-*" files in a source tarball ("make dist" target)
which might be useful to community users who want to build from source.
When merging this up, the "BUILD/compile-*" file list needs to be checked.
BUILD/Makefile.am:
Fix for Bug #34291 compile-amd64-debug-max-no-ndb missing
Include several "BUILD/compile-*" files in a source tarball ("make dist" target)
which might be useful to community users who want to build from source.
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/unireg.h:
Auto merged
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776-encore/my50-bug15776-encore
sql/field.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/errmsg.txt:
Auto merged
sql/unireg.h:
Auto merged
mysql-test/r/type_blob.result:
manual merge.
mysql-test/t/type_blob.test:
manual merge.
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
sql/field.cc:
Auto merged
sql/unireg.h:
Auto merged
Make maximum blob size to be 2**32-1, regardless of word size.
Fix failure of timestamp with size of 2**31-1. The method of
rounding up to the nearest even number would overflow.
mysql-test/r/type_blob.result:
2**32-1 is not a special case for timestamp.
Test 2**32-1 and 2**64 as the reliable test points for both 32-
and 64-bit machines. I'd like to test 2**32, but that would make
tests that vary between architectures.
I'd like to generalize the tests by pulling the max blob size from
the server, and then "eval"ing N-1, N, and N+1 instead of all these
literal numbers, but I have not found a way to get UINT_MAX.
mysql-test/t/type_blob.test:
2**32-1 is not a special case for timestamp.
Test 2**32-1 and 2**64 as the reliable test points for both 32-
and 64-bit machines. I'd like to test 2**32, but that would make
tests that vary between architectures.
I'd like to generalize the tests by pulling the max blob size from
the server, and then "eval"ing N-1, N, and N+1 instead of all these
literal numbers, but I have not found a way to get UINT_MAX.
sql/field.cc:
Fix a bug where the round-to-even code for TIMESTAMP fields
failed where the size would overflow the size to zero and then
fail.
Also, since we silently truncate the size of TIMESTAMP fields, set
the maximum size we report is allowable to be the largest parsable
number.
sql/unireg.h:
Make BLOB size the maximum that the packed value in
field_blob::get_length() allows.
Mtr restarts servers because an option file exist for slave.
The option file for slave forces to skip test.foo table for replication.
But really test case does not invlved test.foo table at all.
So option file can be removed and mtr will not restart servers for test case.
BitKeeper/deleted/.del-rpl_view-slave.opt:
Rename: mysql-test/t/rpl_view-slave.opt -> BitKeeper/deleted/.del-rpl_view-slave.opt
mysql-test/t/disabled.def:
updated
