Commit graph

68072 commits

Author SHA1 Message Date
Georgi Kodinov
b0306dc506 Bug #59148 - made tests experimental 2011-01-10 11:54:05 +02:00
Georgi Kodinov
5c879439d1 merge 2011-01-07 16:29:17 +02:00
Georgi Kodinov
88e666d752 merge 2011-01-07 16:06:24 +02:00
Georgi Kodinov
0c0ef4dd68 automerge 2011-01-07 15:30:54 +02:00
Georgi Kodinov
1ec2fccd6d automerge 2011-01-07 15:30:42 +02:00
Georgi Kodinov
b831c6dbbb automerge 2011-01-07 15:28:36 +02:00
Jimmy Yang
3bdaf40569 Merge from mysql-5.1-security to mysql-5.5-security 2011-01-07 00:00:36 -08:00
Jimmy Yang
95cc85dbf5 Backport Bug #58643 InnoDB: too long table name. Also fix Bug #59312 examine
MAX_FULL_NAME_LEN in InnoDB to address possible insufficient name buffer

Bug #59312 Approved by Sunny Bains
2011-01-06 23:45:59 -08:00
Saikumar V
da9cb6e1e2 Adding more mtr commands to runs engine suites. 2011-01-06 16:47:22 +05:30
Saikumar V
d2b0c83646 Adding more mtr commands to runs engine suites. 2011-01-06 16:09:45 +05:30
Georgi Kodinov
1d9113eae4 merge 2011-01-05 15:02:48 +02:00
Georgi Kodinov
cfc1e33758 Bug #59178: disable the test case 2011-01-05 14:58:05 +02:00
Nirbhay Choubey
a3dc7d4db8 Updating the local repository. 2011-01-05 12:43:30 +05:30
Marc Alff
bd42a05460 Local merge 2011-01-05 08:02:14 +01:00
Nirbhay Choubey
7a8d3e00e9 Modifications in mysql-5.5 engines test suite. 2011-01-05 12:23:05 +05:30
Nirbhay Choubey
7ae713f263 Null-merge from mysql-5.1. 2011-01-05 12:20:55 +05:30
Nirbhay Choubey
c6ffb4b798 Modifications in mysql-5.1 engines test suite. 2011-01-05 12:16:07 +05:30
Jon Olav Hauglid
db2234b95b Merge from mysql-5.1 to mysql-5.5.
No conflicts.
2011-01-04 15:28:03 +01:00
Jon Olav Hauglid
405ac384f5 Bug #50619 assert in handler::update_auto_increment
This assert could be triggered if -1 was inserted into
an auto increment column by a statement writing more than
one row.

Unless explicitly given, an interval of auto increment values
is generated when a statement first needs an auto increment
value. The triggered assert checks that the auto increment
counter is equal to or higher than the lower bound of this
interval.

Generally, the auto increment counter starts at 1 and is
incremented by 1 each time it is used. However, inserting an
explicit value into the auto increment column, sets the auto
increment counter to this value + 1 if this value is higher
than the current value of the auto increment counter.

This bug was triggered if the explicit value was -1. Since the
value was converted to unsigned before any comparisons were made,
it was found to be higher than the current vale of the auto
increment counter and the counter was set to -1 + 1. This value
was below the reserved interval and caused the assert to be
triggered the next time the statement tried to write a row.

With the patch for Bug#39828, this bug is no longer repeatable.
Now, -1 + 1 is detected as an "overflow" which causes the auto
increment counter to be set to ULONGLONG_MAX. This avoids hitting
the assert for the next insert and causes a new interval of
auto increment values to be generated. This resolves the issue.

This patch therefore only contains a regression test and no code
changes. Test case added to auto_increment.test.
2011-01-04 14:36:37 +01:00
Marc Alff
630483d497 Bug#59091 perfschema.binlog_mix and perfschema.binlog_row tests fail with openssl
Fixed the test case to be independent of build options used.
Removed the lowercase-table-names constraint, since performance schema tables are now in lowercase.
2011-01-04 10:04:02 +01:00
Mikael Ronstrom
ee46dc0f23 merge 2011-01-03 15:59:04 +01:00
Tor Didriksen
5216fba54f Add mysys to mysqld dependencies, trying to un-break the build on debian 2011-01-03 14:08:48 +01:00
Guilhem Bichot
b5cedcaa18 merge from 5.1; now this test is not experimental anymore 2010-12-31 12:14:48 +01:00
Guilhem Bichot
3997d4c694 Test which runs slowly on some machines, is marked as big
so will be run only weekly; this closes BUG#50595.
2010-12-31 12:07:34 +01:00
Dmitry Shulga
17de491d53 Test main.log_tables was unmarked as experimental. 2010-12-30 14:17:16 +06:00
Alexander Nozdrin
9b4cfaafaf Auto-merge from mysql-5.1. 2010-12-29 14:36:52 +03:00
Alexander Nozdrin
ce37fd6bb1 Empty merge from mysql-5.0. 2010-12-29 14:34:32 +03:00
Alexander Nozdrin
7a29d13584 Auto-merge from mysql-5.5-bugteam. 2010-12-29 14:31:32 +03:00
Alexander Nozdrin
0df209407d Auto-merge from mysql-5.1-bugteam. 2010-12-29 14:31:09 +03:00
Alexander Nozdrin
a448580d65 Auto-merge from mysql-5.0-bugteam. 2010-12-29 14:30:37 +03:00
unknown
7f6ce96df7 Bug #50914 mysqlbinlog not handling drop of current default database
mysqlbinlog only prints "use $database" statements to its output stream
when the active default database changes between events. This will cause
"No Database Selected" error when dropping and recreating that database.
      
To fix the problem, we clear print_event_info->db when printing an event
of CREATE/DROP/ALTER database statements, so that the Query_log_event
after such statements will be printed with the use 'db' anyway except
transaction keywords.


mysql-test/r/mysqlbinlog.result:
  Test result for Bug#50914.
mysql-test/t/mysqlbinlog.test:
  Added test to verify if the approach of the mysqlbinlog prints
  "use $database" statements to its output stream will cause
  "No Database Selected" error when dropping and recreating
  that database.
sql/log_event.cc:
  Updated code to clear print_event_info->db when printing an event
  of CREATE/DROP/ALTER database statements, so that the Query_log_event
  after such statements will be printed with the use 'db' anyway except
  transaction keywords.
2010-12-29 13:22:52 +08:00
unknown
22639a066c Bug #50914 mysqlbinlog not handling drop of current default database
mysqlbinlog only prints "use $database" statements to its output stream
when the active default database changes between events. This will cause
"No Database Selected" error when dropping and recreating that database.

To fix the problem, we clear print_event_info->db when printing an event
of CREATE/DROP/ALTER database statements, so that the Query_log_event
after such statements will be printed with the use 'db' anyway except
transaction keywords.

mysql-test/r/mysqlbinlog.result:
  Test result for Bug#50914.
mysql-test/t/mysqlbinlog.test:
  Added test to verify if the approach of the mysqlbinlog prints
  "use $database" statements to its output stream will cause
  "No Database Selected" error when dropping and recreating
  that database.
sql/log_event.cc:
  Updated code to clear print_event_info->db when printing an event
  of CREATE/DROP/ALTER database statements, so that the Query_log_event
  after such statements will be printed with the use 'db' anyway except
  transaction keywords.
2010-12-29 11:52:57 +08:00
Kent Boortz
be6c3fd8aa Merge 2010-12-29 01:26:31 +01:00
Kent Boortz
4acfdb9df1 Merge 2010-12-29 00:47:05 +01:00
Kent Boortz
85323eda8a - Added/updated copyright headers
- Removed files specific to compiling on OS/2
- Removed files specific to SCO Unix packaging
- Removed "libmysqld/copyright", text is included in documentation
- Removed LaTeX headers for NDB Doxygen documentation
- Removed obsolete NDB files
- Removed "mkisofs" binaries
- Removed the "cvs2cl.pl" script
- Changed a few GPL texts to use "program" instead of "library"
2010-12-28 19:57:23 +01:00
Sergey Glukhov
0a1433d7b0 5.1-bugteam->5.5-bugteam merge 2010-12-24 14:21:44 +03:00
Sergey Glukhov
bc56dcea9d Bug#57810 case/when/then : Assertion failed: length || !scale
ASSERT happens due to improper calculation of the max_length
in Item_func_div object, if dividend has max_length == 0 then
Item_func_div::max_length is set to 0 under some circumstances.
The fix:
If decimals == NOT_FIXED_DEC then set
Item_func_div::max_length to max possible
DOUBLE length value.


mysql-test/r/func_math.result:
  test case
mysql-test/t/func_math.test:
  test case
sql/item_func.cc:
  The fix:
  If decimals == NOT_FIXED_DEC then set
  Item_func_div::max_length to max possible
  DOUBLE length value.
2010-12-24 14:05:04 +03:00
Georgi Kodinov
bb996a29cc merge 2010-12-23 13:39:58 +02:00
Georgi Kodinov
764873c0d6 merge 2010-12-23 13:36:27 +02:00
Georgi Kodinov
c1fce59c3d fixed the binlog problem 2010-12-23 13:35:42 +02:00
Georgi Kodinov
28a06e5660 merge 2010-12-23 12:49:08 +02:00
Georgi Kodinov
219fba4778 merge 2010-12-23 12:40:40 +02:00
Anitha Gopi
283630356c BUG #59055: RQG was broken after the checkin that removed rpl and rpl_ndb suites. RQG uses MTR V1 and that still has these in the default suite. Removing these from V1. Also removing references to ndb tests in some more disabled.def files 2010-12-21 23:14:48 +05:30
Sergey Glukhov
8bb9639486 automerge 2010-12-21 15:35:54 +03:00
Sergey Glukhov
9870e24482 test case fix 2010-12-21 15:30:07 +03:00
Sven Sandberg
8493c11187 BUG#59084: rpl_do_grant started to fail on FreeBSD (presumably after BUG#49978)
Problem: master executed a statement that would fail on slave
(namely, DROP USER 'create_rout_db'@'localhost').
Then the test did:
  --let $rpl_only_running_threads= 1
  --source include/rpl_reset.inc
rpl_reset.inc calls rpl_sync.inc, which first checks which of
the threads are running and then syncs those threads that are
running. If the SQL thread fails after the check, the sync will
fail. So there was a race in the test and it failed on some
slow hosts.
Fix: Don't replicate the failing statement.
2010-12-21 13:09:38 +01:00
Tor Didriksen
029a5df870 Bug #58699 cannot build with gcc dbg on solaris
cmake/os/SunOS.cmake:
  Remove TARGET_OS_SOLARIS
config.h.cmake:
  Remove TARGET_OS_SOLARIS
  Add PTHREAD_ONCE_INITIALIZER
configure.cmake:
  Add function for testing whether we need { PTHREAD_ONCE_INIT } rather than PTHREAD_ONCE_INIT
include/my_pthread.h:
  Use PTHREAD_ONCE_INITIALIZER if set by cmake.
include/mysql/psi/mysql_file.h:
  Include my_global.h first, to get correct platform definitions.
mysys/ptr_cmp.c:
  Hide the unused static functions in #ifdef's on solaris.
  Use __sun (defined by both gcc and SunPro cc) rather than TARGET_OS_SOLARIS
sql/my_decimal.cc:
  Include my_global.h first, to get correct platform definitions.
sql/mysqld.cc:
  Fix signed/unsigned comparison warning.
sql/sql_audit.h:
  Include my_global.h first, to get correct platform definitions.
sql/sql_plugin.h:
  Include my_global.h first, to get correct platform definitions.
sql/sql_show.cc:
  Fix: warning: cast from pointer to integer of different size
sql/sys_vars.h:
  Use reinterpret_cast rather than c-style cast.
storage/perfschema/pfs_instr.cc:
  Include my_global.h first, to get correct platform definitions.
2010-12-21 13:00:26 +01:00
Sergey Glukhov
3dcdd6957a automerge 2010-12-21 15:40:31 +03:00
Sergey Glukhov
775ca464ce automerge 2010-12-21 15:36:49 +03:00
Sergey Glukhov
928f52e1c1 5.1-bugteam->5.5-bugteam merge 2010-12-21 15:32:15 +03:00