Commit graph

54329 commits

Author SHA1 Message Date
unknown
a6f7fa35b1 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 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'.
2008-05-08 09:41:22 +02:00
unknown
41a7fa623a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
2008-05-07 16:52:49 -03:00
unknown
612a3ab47a Merge riska.(none):/home/sven/bk/b36379-enable_test/gca
into  riska.(none):/home/sven/bkroot/5.1-bugteam


mysql-test/suite/rpl/t/disabled.def:
  Auto merged
2008-05-07 20:17:37 +02:00
unknown
e1a2bb9292 BUG#36398: 'DROP TEMPORARY TABLE' in ROLLBACK transaction causes transaction to be logged
Temporarily checking in an incorrect test case. Rationale: the impact of
this bug is negligible (it's almost a feature request). We need 5.1 to be
stable, and making a real fix is a bit risky. So the fix is postponed
to 6.0.


mysql-test/suite/rpl/r/rpl_ddl.result:
  Updated result file.
mysql-test/suite/rpl/t/disabled.def:
  Enabling test case rpl_ddl.test
2008-05-07 13:02:06 +02:00
unknown
fcec0b017b BUG#36379: please re-enable rpl_innodb_bug28430
The test suite/rpl/t/rpl_innodb_bug28430.test was disabled because of
BUG#32247, but not re-enabled when BUG#32247 was fixed. I've re-enabled
it. The test and result file needed to be updated too.


mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  Updated result file.
mysql-test/suite/rpl/t/disabled.def:
  Enabled the rpl_innodb_bug28430 test case.
mysql-test/suite/rpl/t/rpl_innodb_bug28430.test:
  show slave status is not needed since we have select count(*)
2008-05-07 12:57:07 +02:00
unknown
87e5098249 BUG#35850 "Performance regression in 5.1.23/5.1.24"
- Disable the "prefer full scan on clustered primary key over full scan
  of any secondary key" rule introduced by BUG#35850.
- Update test results accordingly 
(bk trigger: file this for BUG#35850)


mysql-test/r/innodb.result:
  BUG#35850 "Performance regression in 5.1.23/5.1.24"
  - Update test results
mysql-test/r/innodb_mysql.result:
  BUG#35850 "Performance regression in 5.1.23/5.1.24"
  - Testcase
  - Update test results
mysql-test/r/join_outer_innodb.result:
  BUG#35850 "Performance regression in 5.1.23/5.1.24"
  - Update test results
mysql-test/t/innodb_mysql.test:
  BUG#35850 "Performance regression in 5.1.23/5.1.24"
  - Testcase
sql/sql_select.cc:
  BUG#35850 "Performance regression in 5.1.23/5.1.24"
  - Disable the "prefer full scan on clustered primary key over full scan
    of any secondary key" rule introduced by BUG#35850.
2008-05-07 09:58:21 +04:00
unknown
0cf1439cf5 Re-enable test case thread_cache_size_func as Bug 35988
has been fixed and closed.


mysql-test/t/disabled.def:
  Re-enable test case as bug has been fixed.
2008-05-06 23:37:55 -03:00
unknown
d1361c86e7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
2008-05-06 17:08:52 -03:00
unknown
e5491d735f Merge mysql.com:/Users/davi/mysql/bugs/34108-5.1
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
2008-05-06 17:00:08 -03:00
unknown
b54b7c6552 Bug#34108 "Drop function" (test "storedproc_06") returns different message (all handlers)
The problem is that the patch for Bug 33464 didn't update the
results of the test cases which caused the problem.

Dropping a stored routine also revoke privileges for all users
on the stored routine and errors about missing grants are converted
into warnings. Before Bug 33464 such errors could be incorrectly
returned to the user, which would later trigger a assertion due to
multiple errors being set.


mysql-test/suite/funcs_1/r/innodb_storedproc_06.result:
  Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/memory_storedproc_06.result:
  Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/myisam_storedproc_06.result:
  Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/r/ndb_storedproc_06.result:
  Update test case result, grants were already dropped.
mysql-test/suite/funcs_1/storedproc/storedproc_06.inc:
  Add comment regarding bug revealed by test case.
mysql-test/suite/funcs_1/t/disabled.def:
  Re-enable test cases, bug has been fixed.
2008-05-06 15:43:13 -03:00
unknown
5a1b7ddb68 Partial rollback of fix for bug #30059: End-space truncation is inconsistent
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.
2008-05-06 21:43:46 +05:00
unknown
67809a7a27 Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
2008-05-06 16:28:52 +02:00
unknown
726817e676 Adjusted a filaing test and re-enabled it.
mysql-test/r/query_cache_wlock_invalidate_func.result:
  Adjusted test. Query cache doesn't support multiple statements and thus
  using a delimiter change won't work.
mysql-test/t/disabled.def:
  Enabled the query_cache_wlock_invalidate_func test.
mysql-test/t/query_cache_wlock_invalidate_func.test:
  Adjusted test. Query cache doesn't support multiple statements and thus
  using a delimiter change won't work.
2008-05-06 16:17:23 +02:00
unknown
2ac9a30f45 Silence warning due to copying the address of a string constant
into a non-const string pointer.


client/mysqltest.c:
  Don't use a constant string as val may be modified later.
2008-05-06 10:37:36 -03:00
unknown
9a472a218c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
2008-05-06 09:42:39 -03:00
unknown
a7028d97a3 Merge noir.wlan.koehntopp.de:/misc/mysql/mysql-5.0-bugteam
into  noir.wlan.koehntopp.de:/misc/mysql/mysql-5.1-bugteam


mysys/my_static.c:
  Auto merged
mysys/my_static.h:
  Auto merged
2008-05-06 11:52:23 +02:00
unknown
65a310fe2a revert the push of bug 35616. 2008-05-06 11:57:19 +03:00
unknown
55c336fd0e Bug#35616: memory overrun on 64-bit linux on setting large values for keybuffer-size
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.
2008-05-06 02:55:35 +02:00
unknown
d2fb100ca5 Merge mysql.com:/Users/davi/mysql/bugs/36031-5.1
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam


client/mysqltest.c:
  Auto merged
2008-05-05 17:26:43 -03:00
unknown
2d7b51922a Fix for the latest instability found within funcs_1: ndb_views
Bug#31237 Test "ndb_views" fails because of differing order of select results


mysql-test/suite/funcs_1/r/innodb_views.result:
  Updated results
mysql-test/suite/funcs_1/r/memory_views.result:
  Updated results
mysql-test/suite/funcs_1/r/myisam_views.result:
  Updated results
mysql-test/suite/funcs_1/r/ndb_views.result:
  Updated results
mysql-test/suite/funcs_1/views/views_master.inc:
  Mangle the row numbers
2008-05-05 19:49:17 +02:00
unknown
ef32ec61de Merge magare.gmz:/home/kgeorge/mysql/autopush/merge-5.0-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
2008-05-05 15:21:03 +03:00
unknown
ac8585e88a Merge bk-internal:/home/bk/mysql-5.0
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam


mysql-test/mysql-test-run.pl:
  Auto merged
2008-05-05 15:04:26 +03:00
unknown
229b3db400 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/BARE/mysql-5.1-bugteam
2008-05-05 13:28:07 +03:00
unknown
7ecc40cc61 Bug#36031 Test funcs_1.<engine>_views failing on Windows
The problem is a hack in mysqltest.c::append_field that modifies
the exponential notation of floating point numbers by removing a
zero after the the symbol 'e' (eg: 00001.2e+018 is converted to
00001.2e+18) but does not take into account the zerofill affect
in the start of the string.

The solution is to check if the field was zero filled and insert
a zero at the start of the string if a zero after the exponential
notation symbol is removed.


client/mysqltest.c:
  Preserve zerofill affect when removing a zero after
  the exponential notation symbol.
2008-05-02 15:10:32 -03:00
unknown
ae7c0deaf9 Remove unused variable 2008-05-02 19:44:18 +02:00
unknown
390b57f2ac Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-bugteam


client/mysqltest.c:
  Auto merged
dbug/dbug.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
client/mysql_upgrade.c:
  SCCS merged
2008-05-02 19:42:34 +02:00
unknown
6aadc3e2b9 Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-bugteam


client/mysqltest.c:
  Auto merged
2008-05-02 19:01:32 +02:00
unknown
8d3952e99b Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
2008-05-02 14:42:34 +02:00
unknown
6add5be771 Bug#36469 mysql_upgrade does not use --tmpdir
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
2008-05-02 14:41:19 +02:00
unknown
b2591df890 Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
2008-05-02 14:22:15 +02:00
unknown
7f5119d3e5 Bug#35986 valgrind warning in DbugParse for empty string in SET GLOBAL DEBUG=""
- 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
2008-05-02 12:49:31 +02:00
unknown
80e550f8bd Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
2008-05-02 11:22:56 +02:00
unknown
cde8f109b9 Bug#36465 mysqltest should always use the --tmpdir
client/mysqltest.c:
  Use the --tmpdir location to create temporary files
2008-05-02 11:22:10 +02:00
unknown
f508244ded Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
2008-05-02 09:15:23 +02:00
unknown
9018c56ac4 Bug#36463 mysql-test-run.pl should always use the --tmpdi
mysql-test/mysql-test-run.pl:
  Use the requested tmpdir in 'collect_mysqld_features', create
  it if it does not already exists
2008-05-02 09:13:43 +02:00
unknown
9418fd20d5 Merge bk-internal:/home/bk/mysql-5.0-build
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
2008-05-02 08:42:48 +02:00
unknown
ca0939d57d Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.0-trigs
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs
2008-05-01 12:36:56 -04:00
unknown
abf8b70a0a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.0-trigs
2008-05-01 12:15:38 -04:00
unknown
b837c42041 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs


client/mysqltest.c:
  Auto merged
2008-05-01 11:58:39 -04:00
unknown
5cda5240a6 Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.0-trigs
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs


client/mysqltest.c:
  Auto merged
2008-05-01 11:37:34 -04:00
unknown
38c28141a8 Bug#36026 - Test funcs_1.<engine>_trig_03 failing on Windows
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
2008-05-01 11:36:03 -04:00
unknown
6ef8efd4d5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  magare.gmz:/home/kgeorge/mysql/autopush/B36041-5.1-bugteam
2008-05-01 17:51:26 +03:00
unknown
a2c99f5977 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  magare.gmz:/home/kgeorge/mysql/autopush/B36041-5.1-bugteam
2008-05-01 16:34:14 +03:00
unknown
803d77f84f Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam
into  magare.gmz:/home/kgeorge/mysql/autopush/B35298-5.1-bugteam


configure.in:
  Auto merged
2008-05-01 16:15:38 +03:00
unknown
4f3549638a Merge bk-internal:/home/bk/mysql-5.0-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


configure.in:
  merge 5.0-bugteam to 5.1-bugteam
2008-05-01 15:59:51 +03:00
unknown
0e287a9c9c Merge magare.gmz:/home/kgeorge/mysql/work/B35298-5.0-bugteam
into  magare.gmz:/home/kgeorge/mysql/work/B35298-5.1-bugteam


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
configure.in:
  merge 5.0-bugteam to 5.1-bugteam
2008-05-01 14:54:59 +03:00
unknown
1a68ec2809 Fix for bug #35298: GROUP_CONCAT with DISTINCT can crash the server
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
2008-05-01 13:49:26 +03:00
unknown
cf2b2cc506 Merge bk-internal:/home/bk/mysql-5.0
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
2008-05-01 13:40:56 +03:00
unknown
fefb7c6be6 Merge bk-internal:/home/bk/mysql-5.1
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


mysql-test/t/disabled.def:
  Auto merged
2008-05-01 13:25:38 +03:00
unknown
a701a84998 Use ulonglong to store row count in libmysld Protocol_text::remove_last_row()
(fix warnings).


libmysqld/lib_sql.cc:
  Use ulonglong to store row count in Protocol_text::remove_last_row()
  (fix warnings).
2008-04-30 19:14:41 -06:00