Commit graph

60482 commits

Author SHA1 Message Date
Luis Soares
4eda0bf0b0 Automerge from mysql-trunk-bugfixing. 2010-02-10 12:16:49 +00:00
Luis Soares
5df69267c2 BUG#50984: check_testcase fails for rpl_tmp_table_and_DDL
We found that there are some tests that are not cleaning
up properly:
      
  1. rpl_tmp_table_and_DDL
  2. rpl_do_grant
  3. rpl_sync
      
For #1 and #2 we found that the slave would not, for some
cases, replicate all the instructions the master processed 
in the cleanup section. We fix these by deploying some 
synchronization commands in the test cases so that slave 
processes all clean up instructions.
      
As for #3, this is tracked as part of another bug 
(BUG@50442).
2010-02-10 12:12:55 +00:00
Mattias Jonsson
6cd0eebed8 merge 2010-02-10 11:08:39 +01:00
Mattias Jonsson
dca6700620 Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table
Problem was that in mysql-trunk the ER() macro is now dependent on current_thd
and the innodb monitor thread has no binding to that thd object. This cause 
the crash because of bad derefencing.

Solution was to add a new macro which take the thd as an argument (which the innodb
thread uses for the call).

(Updated according to reviewers comments, i.e. added ER_THD_OR_DEFAULT and
moved test to suite parts.)

mysql-test/suite/parts/r/partition_innodb_status_file.result:
  Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table
  
  New test result file
mysql-test/suite/parts/t/partition_innodb_status_file-master.opt:
  Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table
  
  New test opt file
mysql-test/suite/parts/t/partition_innodb_status_file.test:
  Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table
  
  New test.
  Note that the innodb monitor thread only runs every 15 seconds, so this
  test will take at least 15 seconds, so I have moved it to the parts suite.
sql/sql_table.cc:
  Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table
  
  Using thd safe ER macro.
sql/unireg.h:
  Bug#50201: Server crashes in explain_filename on an InnoDB partitioned table
  
  Added ER macros for use with specified thd pointer.
2010-02-10 10:47:14 +01:00
Alexander Nozdrin
b0e2a9b2d5 Auto-merge (empty) from mysql-trunk-bugfixing. 2010-02-09 15:05:30 +03:00
Alexander Nozdrin
043f39e060 Auto-merge from mysql-next-mr. 2010-02-09 15:01:20 +03:00
Alexander Nozdrin
f5311bba7e Auto-merge from mysql-trunk. 2010-02-09 14:04:56 +03:00
Alexander Nozdrin
6dd9375726 1. Disable ndb_condition_pushdown.test due to Bug 49746.
2. Update test result files.
2010-02-09 13:16:01 +03:00
Alexander Nozdrin
4f9a1f49c8 Manual merge from mysql-trunk.
Conflicts:
  - mysql-test/suite/ndb/r/ndb_dd_ddl.result
2010-02-09 13:14:29 +03:00
Alexander Nozdrin
06ce01bace Fix ndb_dd_ddl.test: drop created database after use. 2010-02-09 13:10:36 +03:00
Alexander Nozdrin
542b661de9 Auto-merge from mysql-trunk. 2010-02-09 13:09:20 +03:00
Joerg Bruehe
5d115bbe0c Upmerge "configure.in" text change from 5.1 to 5.5 ("trunk"),
fixing bug#50950.
2010-02-08 22:16:07 +01:00
Joerg Bruehe
ed75cda355 Upmerge "configure.in" text change from 5.0 to 5.1,
fixing bug#50950.
2010-02-08 21:40:17 +01:00
Joerg Bruehe
72da6b3185 Bug#50950 Obsolete reference to www.mysql.com
in message printed at end of configure

New text for the success message of "configure".

configure.in:
  The message must be changed to drop the "www.mysql.com" URL.
2010-02-08 21:10:37 +01:00
Horst.Hunger
2d58a95bb9 Patch to fix bug#50981. Replace now the result ::1 by localhost for Windows. Both is valid. 2010-02-08 11:43:56 +01:00
Vladislav Vaintroub
7391f5f6c5 merge 2010-02-05 18:02:26 +01:00
Vladislav Vaintroub
5d034c00f3 merge 2010-02-05 18:01:00 +01:00
Marc Alff
d935204240 Merge mysql-next-mr-marc --> mysql-next-mr-bugfixing 2010-02-05 09:56:55 -07:00
Vladislav Vaintroub
a129a22873 Bug#50057: SHOW PROFILE CPU for Windows
On QA request, adding test that causes new code to be called. 
Even if we cannot validate the result, this will at least increase the code coverage.
2010-02-05 17:31:34 +01:00
Marc Alff
238d78d090 merge from mysql-next-mr 2010-02-05 09:23:57 -07:00
Alexander Nozdrin
96f3134269 Auto-merge (empty) from mysql-trunk-bugfixing. 2010-02-05 18:45:01 +03:00
Alexander Nozdrin
6c72fce890 Auto-merge from mysql-next-mr. 2010-02-05 18:43:29 +03:00
Alexander Nozdrin
eb71316090 Auto-merge from mysql-trunk. 2010-02-05 18:43:22 +03:00
Alexander Nozdrin
b38ef2b5f7 Auto-merge from mysql-trunk-merge. 2010-02-05 18:33:33 +03:00
Alexander Nozdrin
7e0d0dd040 Cherry-pick merge from mysql-5.1-bugteam.
Original revision:
------------------------------------------------------------
revision-id: kent.boortz@sun.com-20100204182709-dw1dwpglkd5qrehb
committer: Kent Boortz <kent.boortz@sun.com>
branch nick: mysql-5.1-bugteam
timestamp: Thu 2010-02-04 19:27:09 +0100
message:
  LT_INIT and LT_PREREQ was added in libtool 2.2 2008, a bit too
  recent, switched back to the older AC_PROG_LIBTOOL
------------------------------------------------------------
2010-02-05 18:31:06 +03:00
Alexander Nozdrin
d9c4234bc9 Auto-merge (empty) from mysql-trunk-merge. 2010-02-05 18:24:50 +03:00
Alexander Nozdrin
b6d1b25d50 Manual merge (empty) from mysql-5.1. 2010-02-05 18:14:01 +03:00
Alexander Nozdrin
5aebe20843 Auto-merge (empty) from mysql-trunk-bugfixing. 2010-02-05 18:11:16 +03:00
Marc Alff
ae7615c091 Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marc 2010-02-05 08:10:20 -07:00
Alexander Nozdrin
23899d6d6b Auto-merge from mysql-next-mr. 2010-02-05 18:06:46 +03:00
Alexander Nozdrin
f53d591e9f Remove errmsg.txt and errmsg-cnv.sh. Use errmsg-utf8.txt instead. 2010-02-05 16:52:35 +03:00
Vladislav Vaintroub
e6cba2be35 Bug#50057: 'SHOW PROFILE CPU' port for Windows.
Patch contributed by Alex Budovski.
2010-02-05 13:57:15 +01:00
Alexander Nozdrin
a45ea00b32 Manual merge from mysql-next-mr.
Conflicts:
  - sql/sys_vars.cc
2010-02-05 15:05:37 +03:00
Alexander Nozdrin
44c3e5fc45 Auto-merge from mysql-trunk. 2010-02-05 15:02:03 +03:00
Alexander Nozdrin
ad935d4708 Auto-merge (empty) from mysql-trunk-bugfixing. 2010-02-05 14:50:43 +03:00
unknown
88519d1c8f Raise version number after cloning 5.1.44 2010-02-04 12:23:33 +01:00
Georgi Kodinov
404b3be1ee merge 2010-02-04 12:14:44 +02:00
Georgi Kodinov
b8db15fc22 tree name change 2010-02-04 12:13:29 +02:00
Alexander Nozdrin
619037517f Fix test result file after manual merge. 2010-02-04 09:35:40 +03:00
He Zhenxing
fce7472225 Auto merge 2010-02-04 12:47:42 +08:00
He Zhenxing
79aaaa8a9a audit plugin has already backported
Null merge the fix for Bug#49894
2010-02-04 12:42:57 +08:00
He Zhenxing
c879ed2e9b Auto merge from 5.1-rep-semisync 2010-02-04 12:37:56 +08:00
He Zhenxing
6ad93ebbb6 Bug#49894 shifted MYSQL_REPLICATION_PLUGIN number
The number for MYSQL_REPLICATION_PLUGIN was shifted when backporting
because MYSQL_AUDIT_PLUGIN was not backported.

This problem is fixed by backporting only the number of audit plugin
and print an error when trying to load audit plugins. Note that
replication plugins compiled against old MYSQL_REPLICATION_PLUGIN
number will also be recognized as audit plugin and be rejected.

include/mysql/plugin.h:
  backporting the number of audit plugin (MYSQL_AUDIT_PLUGIN)
sql/sql_plugin.cc:
  backporting the number of audit plugin (MYSQL_AUDIT_PLUGIN)
  print an error when trying to load audit plugins
2010-02-04 12:14:32 +08:00
Luis Soares
6b59135985 Fixes result file for binlog_stm_mix_innodb_myisam which was
left unchanged on patch for BUG#50192.
2010-02-04 01:20:42 +00:00
Alexander Nozdrin
fa03afee90 Manual merger from mysql-trunk-merge.
Conflicts:
  - configure.in
2010-02-04 00:52:48 +03:00
Alexander Nozdrin
ab73713265 Manual merge from mysql-trunk-merge.
Conflicts:
  - configure.in
2010-02-04 00:37:59 +03:00
Alexander Nozdrin
c746716869 Manual merge from mysql-trunk-merge.
Conflicts:
  - sql/sql_show.cc
2010-02-03 23:26:58 +03:00
Alexander Nozdrin
4a6457c8cb Manual merge from mysql-trunk-merge.
Conflicts:
  - sql/sql_select.cc
2010-02-03 23:15:57 +03:00
Alexander Nozdrin
1a46ff873e Manual merge from mysql-5.1-bugteam.
Conflicts:
  - configure.in
  - mysql-test/include/setup_fake_relay_log.inc
  - sql/sql_select.cc
2010-02-03 20:22:58 +03:00
Luis Soares
90a79ca4ad BUG#50364: manual merge to mysql-next-mr-bugfixing.
Conflicts
=========
Text conflict in sql/repl_failsafe.cc

Additional changes
==================
Replace references to pthread_mutex with mysql_mutex
2010-02-03 17:19:58 +00:00