Commit graph

58885 commits

Author SHA1 Message Date
Sergey Glukhov
c06b791bb4 Bug#39270 I_S optimization algorithm does not work properly in some cases
backport to Betony
2009-10-23 12:02:55 +05:00
Sergey Glukhov
9745498778 Bug#24062 Incorrect error msg after execute DROP TABLE IF EXISTS on information_schema
backport to Betony
2009-10-23 11:56:30 +05:00
Sergey Glukhov
1ad9d1f1df Bug#5299 Remove SHOW COLUMN TYPES, backport to Betony 2009-10-23 11:20:44 +05:00
Alexander Nozdrin
6b75adb020 Automerge from mysql-trunk-bugfixing. 2009-10-23 00:26:57 +04:00
Alexander Nozdrin
a8c6e84a42 Automerge from mysql-next-mr. 2009-10-23 00:24:32 +04:00
Alexander Nozdrin
2a6e8d37f1 Automerge from mysql-trunk. 2009-10-23 00:24:24 +04:00
Alexander Nozdrin
75116feb4b Merge from mysql-trunk. 2009-10-23 00:14:05 +04:00
Alexander Nozdrin
2fc2acd7f5 Fix default.conf. 2009-10-23 00:13:18 +04:00
Alexander Nozdrin
29a4ba0619 Automerge from mysql-trunk-bugfixing. 2009-10-22 22:08:44 +04:00
Alexander Nozdrin
564952afb0 Automerge from mysql-next-mr. 2009-10-22 22:06:01 +04:00
Alexander Nozdrin
4f12a0ba80 Automerge from mysql-trunk. 2009-10-22 22:05:42 +04:00
Jonathan Perkin
ffde6bbb15 Merge to mysql-next-mr-bugfixing. 2009-10-22 16:50:39 +01:00
Jonathan Perkin
136a4225c7 Apply missing patch from bug#46834 to mysql-trunk-bugfixing. 2009-10-22 16:48:52 +01:00
Bjorn Munch
c01fcec8f8 null upmerge from trunk-mtr 2009-10-22 09:40:16 +02:00
Bjorn Munch
e26a2f3b61 new merge from next-mr 2009-10-22 09:36:39 +02:00
Bjorn Munch
d5bfcd6abe null merge from 5.1 2009-10-22 09:28:39 +02:00
Bjorn Munch
3a2434d432 new merge from trunk 2009-10-22 09:13:44 +02:00
Alexander Nozdrin
bcaa7524d9 Merge from mysql-trunk-merge. 2009-10-22 10:07:56 +04:00
Alexander Nozdrin
469ce38b99 Pass --vardir to MTR in mysql-trunk.push. 2009-10-22 10:05:53 +04:00
Alexander Nozdrin
336505395e Disable the test in mysql-trunk because of Bug#46931
instead of making it experimental.
2009-10-22 10:01:23 +04:00
Alexander Nozdrin
2c5ee88a56 Backport WL#4098 from 6.0.
The value was changed from 1024 to 2048,
because 1024 is already used.

Original revision:
------------------------------------------------------------
revno: 2476.657.259
committer: tsmith@bk-internal.mysql.com
timestamp: Tue 2008-01-29 19:32:44 +0100
message:
  WL#4098: Add a status flag for slow queries
  
  Add new result set status flag SERVER_QUERY_WAS_SLOW in mysql_com.h.
  
  There is no server-side implementation to actually set this flag at this
  time.  This patch simply defines the interface so that applications can
  make use of it.  See the worklog for background.
------------------------------------------------------------
2009-10-21 18:10:19 +04:00
Alexander Nozdrin
6756b0fc5f Backporting WL#3953 from 6.0. Original revision:
------------------------------------------------------------
revno: 2476.714.9
committer: markleith@medusa.mysql.com
timestamp: Mon 2007-09-03 23:18:50 +0100
message:
  Bug#25822 / WL#3953 - Log Access Denied errors for bad passwords in the error log
  
  Added logging of Access Denied messages on failed new connections to the 
  error log when log-warnings = 2.
  
  This allows a user to log these messages without having to incur the overhead
  of using the general query log on production systems.
------------------------------------------------------------
2009-10-21 18:00:58 +04:00
Alexander Nozdrin
ff98b6a2c2 Update errmsg-utf8.txt after automerge. 2009-10-21 17:25:10 +04:00
Alexander Barkov
dcb8bb23c2 Merging mysql-next-mr-merge to mysql-next-mr. 2009-10-21 15:48:22 +05:00
Bjorn Munch
0632e9a407 merge from next-mr 2009-10-21 12:18:33 +02:00
Alexander Nozdrin
52701ff327 Merge from mysql-trunk-merge. 2009-10-21 00:27:37 +04:00
Alexander Nozdrin
265eee595b Mark rpl.rpl_innodb_bug28430 experimental unconditionally. 2009-10-21 00:26:56 +04:00
Alexander Nozdrin
e30e0325a2 Merge from mysql-trunk-merge. 2009-10-21 00:24:42 +04:00
Satya B
78dde957e9 Fix the windows Build failure due to the changes to CMakelists by r2910.
Remove the extra line which try to use the name INNOBASE again. The IF ELSE
loop above declares the library name based on the version of mysql
2009-10-20 16:11:50 +05:30
Bjorn Munch
78b2ca30c6 merge 48149 2009-10-20 12:06:33 +02:00
Bjorn Munch
0777ef567d merge 48149 2009-10-20 12:05:28 +02:00
Bjorn Munch
4113d6ca88 merge 48149 2009-10-20 12:04:55 +02:00
Alexander Nozdrin
5c4cb505ef Merge from mysql-trunk-merge. 2009-10-20 13:46:43 +04:00
Satya B
221c7df75c Merge a CMakeLists.txt change from Innodb plugin 1.0.5 2009-10-20 15:12:38 +05:30
Alexander Nozdrin
82bb84e1aa A fix for innodb_bug44369.test due to Bug#47233 (Innodb calls
push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)).

The Signal/Resignal patch changes the push_warning() API: now
it silently downgrades WARN_LEVEL_ERROR to WARN_LEVEL_WARN.

This patch should be rolled back when Bug#47233 is fixed.
2009-10-20 13:37:07 +04:00
Evgeny Potemkin
ad68fa6506 Auto-merged fix for the bug#41760. 2009-10-20 11:32:38 +04:00
Evgeny Potemkin
4349a4726e #41760 Inserting into multiple-table views is not working
During insert, we are not reading the rows in a referring table but
instead using the last read row that happens to be in table->record[0].

Now INSERT into such view is denied. 


mysql-test/r/delayed.result:
  A test case result is adjusted after fixing bug#41760.
mysql-test/r/insert.result:
  A test case result is adjusted after fixing bug#41760.
mysql-test/t/delayed.test:
  A test case is adjusted after fixing bug#41760.
mysql-test/t/insert.test:
  A test case is adjusted after fixing bug#41760.
2009-10-20 11:30:41 +04:00
Alexander Nozdrin
2c3d501189 Automerge from mysql-trunk-merge. 2009-10-19 22:41:18 +04:00
Alexander Nozdrin
a1ac1b7d48 Automerge from mysql-trunk. 2009-10-19 22:40:08 +04:00
Bjorn Munch
e6bc01d170 Bug #48149 MTR should automatically skip SSL tests if SSL not supported
Knowledge of no SSL support is not used
Skip tests the same way e.g. innodb tests are
Does not refer to have_ssl_communication.inc, 
     will add this when merging to 6.0-codebase
2009-10-19 15:51:47 +02:00
Alexander Nozdrin
bd60794fd8 Merge from mysql-trunk-merge. 2009-10-19 17:36:19 +04:00
Bjorn Munch
2f36bc160a merge 48130 and 48133 2009-10-19 15:33:34 +02:00
Alexander Nozdrin
03bf73de2f Merge from mysql-5.1. 2009-10-19 17:28:31 +04:00
Guilhem Bichot
70fab22cab Back-port from 6.0 of the fix for
BUG#41759: "Valgrind warning: Invalid read of size 1 open_tables() with ps-protocol"
(from revid:sergefp@mysql.com-20081227013233-f9n2by8romt37hyi)
2009-10-19 15:23:42 +02:00
Alexander Nozdrin
b76ccb1276 Merge from mysql-5.1. 2009-10-19 17:19:37 +04:00
Alexander Nozdrin
3251065aef Merge from mysql-5.1. 2009-10-19 17:17:08 +04:00
Guilhem Bichot
3088f6c7ba Back-port from 6.0 of the fix for
BUG#38049 "incorrect rows estimations with references from preceding table"
(from revid:sergefp@mysql.com-20090126194259-ue20il3qro529l4d).
Compared to 6.0 where EXPLAIN indicates "Using index condition", here in join_optimizer.result
we see "Using where"; it's normal; 6.0 shows the same if disabling Index Condition Pushdown.
2009-10-19 15:14:43 +02:00
Bjorn Munch
6203b7b367 merge 48130 and 48133 from 5.1 2009-10-19 15:14:26 +02:00
Sergei Golubchik
425c5ecd7c Bug#34374 mysql generates incorrect warning
backport to next-mr
2009-10-19 15:13:45 +02:00
Bjorn Munch
599b745bc1 merge 48130 and 48133 from 5.1 2009-10-19 15:12:16 +02:00