1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-08 00:28:29 +03:00
Commit Graph

26186 Commits

Author SHA1 Message Date
Vladislav Vaintroub
d003ddfdab merge 2009-10-07 16:34:45 +02:00
Magnus Blåudd
8ccd9d7cbe BUG#47612 - fix review comment 2009-10-07 16:25:36 +02:00
Magnus Blåudd
04e99c1009 Bug#42589 mysql_fix_privilege_tables.sh to be deprecated
- Remove remnants of "mysql_fix_privilege_tables.sh"(again)
2009-10-07 15:42:16 +02:00
Andrei Elkin
e4abe4eb3c correcting rpl_partition.result 2009-10-07 01:05:27 +03:00
Magnus Blåudd
9665f134e3 Bug#47867 compiler warning _WIN32_WINNT macro redefinition
- Remove the conflicting macro definitions since we define a higher value
   directly in the cmake files.
2009-10-06 18:10:34 +02:00
Mikael Ronstrom
b216aab1c4 BUG#47837, Duplicate field names were allowed in both column list partitioning and key partitioning, added check to give error in this case 2009-10-06 17:01:59 +02:00
Mikael Ronstrom
8ca9f1e987 BUG#47838, NULL values in ranges was dropped due to missing else part in store_tuple_to_record, added more tests 2009-10-06 16:22:54 +02:00
Mikael Ronstrom
19ef2eff9c BUG#47838, NULL values in ranges was dropped due to missing else part in store_tuple_to_record 2009-10-06 16:22:15 +02:00
Bjorn Munch
a611e2eba1 merge of 47383 from 5.1-mtr 2009-10-06 14:37:37 +02:00
Alexander Nozdrin
f952bbe55c Merge revno:2617.31.54 from 6.0. 2009-10-06 14:56:23 +04:00
Alexander Nozdrin
ca8706ff0f Backport WL#4085: Merge revno:2476.657.219 from 6.0. 2009-10-06 14:47:04 +04:00
Alexander Barkov
a16a82d4eb Bsckporting WL#3764 Sinhala Collation
modified:
  mysql-test/r/ctype_utf8.result
  mysql-test/t/ctype_utf8.test
  mysys/charset-def.c
  strings/ctype-uca.c
2009-10-06 15:34:49 +05:00
Alfranio Correia
2a243fa2ce mysql-5.1-bugteam (local) --> mysql-5.1-bugteam 2009-10-06 11:25:36 +01:00
Bjorn Munch
a3f4fcc5ae merge 46327 and 47811 from 5.1-mtr 2009-10-06 10:58:29 +02:00
Bjorn Munch
0311f538b0 Bug #47811 ./mysql-test-run.pl --valgrind uses old (too narrow) allignment
Remove the alignment option, let valgrind use its default
2009-10-06 10:42:05 +02:00
Bjorn Munch
a0ed9a389d Bug #46327 MTR2 prevents gcov data accumulation
mysqladmin fails on Linux in 6.0 without --character-sets-dir
Also added timeout for server shutdown, hope this will solve it
2009-10-06 10:35:35 +02:00
Georgi Kodinov
cfd737a472 merge mysql-5.1-pe 2009-10-06 10:10:47 +03:00
Alexander Barkov
1c58e90695 Backporting WL#4642 Greek locale for DAYNAME, MONTHNAME, DATE_FORMAT
added:
  mysql-test/r/locale.result
  mysql-test/t/locale.test
modified:
  mysql-test/r/variables.result
  mysql-test/t/variables.test
  sql/sql_locale.cc
2009-10-06 11:02:51 +05:00
Alfranio Correia
b31e0c9a48 BUG#47678 Changes to n-tables that happen early in a trans. are only flushed upon commit
Let
    - T be a transactional table and N non-transactional table.
    - B be begin, C commit and R rollback.
    - N be a statement that accesses and changes only N-tables.
    - T be a statement that accesses and changes only T-tables.

In RBR, changes to N-tables that happen early in a transaction are not immediately flushed
upon committing a statement. This behavior may, however, break consistency in the presence
of concurrency since changes done to N-tables become immediately visible to other
connections. To fix this problem, we do the following:

  . B N N T C would log - B N C B N C B T C.
  . B N N T R would log - B N C B N C B T R.

Note that we are not preserving history from the master as we are introducing a commit that
never happened. However, this seems to be more acceptable than the possibility of breaking
consistency in the presence of concurrency.
2009-10-06 01:54:00 +01:00
Alfranio Correia
678eb3d66f BUG#47287 RBR: replication diff on basic case with txn- and non-txn tables in a statement
Let
  - T be a transactional table and N non-transactional table.
  - B be begin, C commit and R rollback.
  - M be a mixed statement, i.e. a statement that updates both T and N.
  - M* be a mixed statement that fails while updating either T or N.

This patch restore the behavior presented in 5.1.37 for rows either produced in
the RBR or MIXED modes, when a M* statement that happened early in a transaction
had their changes written to the binary log outside the boundaries of the
transaction and wrapped in a BEGIN/ROLLBACK. This was done to keep the slave
consistent with with the master as the rollback would keep the changes on N and
undo them on T. In particular, we do what follows:

  . B M* T C would log - B M* R B T C.

Note that, we are not preserving history from the master as we are introducing a
rollback that never happened. However, this seems to be more acceptable than
making the slave diverge. We do not fix the following case:

  . B T M* C would log B T M* C.

The slave will diverge as the changes on T tables that originated from the M
statement are rolled back on the master but not on the slave. Unfortunately, we
cannot simply rollback the transaction as this would undo any uncommitted
changes on T tables.

SBR is not considered in this patch because a failing statement is written to
the binary along with the error code and a slave executes and then rolls back
the statement when it has an associated error code, thus undoing the effects
on T. In RBR and MBR, a full-fledged fix will be pushed after the WL 2687.
2009-10-06 01:38:58 +01:00
Guilhem Bichot
528ab7bb11 Backport of the fix for BUG#33730 "Full table scan instead selected partitions for query more than 10 partitions"
from 6.0, made in sergefp@mysql.com-20090205190644-q8632sniogedhtsu
2009-10-05 22:59:19 +02:00
Alexander Barkov
21317d5df3 WL#4584 Internationalized number format
@ mysql-test/r/func_str.result
   Adding tests
@ mysql-test/t/func_str.test
   Adding tests
@ mysql-test/t/variables.test
   Fixing error number
@ sql/item_create.cc
   Allowing 2 and 3 arguments to format()
@ sql/item_strfunc.cc
   Adding new formatting code.
@ sql/item_strfunc.h
   Adding new contructors and "locale" member
@ sql/mysql_priv.h
   Adding number formatting members into MY_LOCALE
@ sql/sql_locale.cc
   Adding number formatting data into locale constants
@ sql/set_var.cc
   Using new error message
@ sql/share/errmgs.txt
   Adding new error message
2009-10-05 20:06:04 +05:00
Guilhem Bichot
843b73b34b Port of fix for BUG#42893 "main.information_schema times out sporadically"
(from revision konstantin@mysql.com-20080627154042-923m6lzk7z77lrgj ). This moves the slow part
(10 seconds over 13) into a separate big test.
2009-10-05 16:22:48 +02:00
Mikael Ronstrom
bd80727833 BUG#47776, Fixed character set handling, used wrong length, eventually also found that didn't need to convert to my_strnxfrm-format for column list partitioned tables, also column list partitioned tables can use multi-byte character sets in partition fields as well as where strxfrm multiplies the number of bytes in the string 2009-10-05 16:10:18 +02:00
John H. Embretsen
23bdf0d805 Bug#47746 - main.innodb_mysql fails sporadically:
Mask part of EXPLAIN output with '#' to account for varying row count estimation.
2009-10-05 15:16:27 +02:00
Satya B
37e4f861ed Applying InnoDB snapshot 5.1-ss5921, part 2. Fixes BUG#44369
BUG#44369 - InnoDB: Does not uniformly disallow disallowed column names

Detailed revision comments:

r5741 | jyang | 2009-09-03 07:16:01 +0300 (Thu, 03 Sep 2009) | 5 lines
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.


r5760 | jyang | 2009-09-04 07:07:34 +0300 (Fri, 04 Sep 2009) | 3 lines
branches/5.1: This is to revert change 5741. A return status for
create_table_def() needs to be fixed.

r5834 | jyang | 2009-09-11 00:43:05 +0300 (Fri, 11 Sep 2009) | 5 lines
branches/5.1: Block creating table with column name conflicting
with Innodb reserved key words. (Bug #44369) rb://151 approved
by Sunny Bains.
2009-10-05 16:47:48 +05:30
Bjorn Munch
aef601d4e3 merge 47243 from 5.1 2009-10-05 13:12:04 +02:00
Satya B
cfae755d7d Applying InnoDB snapshot 5.1-ss5921, Part 1. Fixes BUG#46000
1. BUG#46000 - using index called GEN_CLUST_INDEX crashes server

Detailed revision comments:

r5895 | jyang | 2009-09-15 03:39:21 +0300 (Tue, 15 Sep 2009) | 5 lines
branches/5.1: Disallow creating index with the name of
"GEN_CLUST_INDEX" which is reserved for the default system
primary index. (Bug #46000) rb://149 approved by Marko Makela.
2009-10-05 16:39:07 +05:30
Bjorn Munch
bd3e299482 Bug #47243 Allow MTR to read max auto setting for --parallel from env. variable
In stead of hard-coded 8, read from $MTR_MAX_PARALLEL if set
2009-10-05 13:08:10 +02:00
Georgi Kodinov
67ac3fac7f fixed typos in exeprimental list 2009-10-05 11:18:59 +03:00
Gleb Shchepa
2b78dbff54 Bug #44139: Table scan when NULL appears in IN clause
SELECT ... WHERE ... IN (NULL, ...) does full table scan,
even if the same query without the NULL uses efficient range scan.

The bugfix for the bug 18360 introduced an optimization:
if
  1) all right-hand arguments of the IN function are constants
  2) result types of all right argument items are compatible
     enough to use the same single comparison function to
     compare all of them to the left argument,

then

  we can convert the right-hand list of constant items to an array
  of equally-typed constant values for the further
  QUICK index access etc. (see Item_func_in::fix_length_and_dec()).

The Item_null constant item objects have STRING_RESULT
result types, so, as far as Item_func_in::fix_length_and_dec()
is aware of NULLs in the right list, this improvement efficiently
optimizes IN function calls with a mixed right list of NULLs and
string constants. However, the optimization doesn't affect mixed
lists of NULLs and integers, floats etc., because there is no
unique common comparator.


New optimization has been added to ignore the result type
of NULL constants in the static analysis of mixed right-hand lists.
This is safe, because at the execution phase we care about
presence of NULLs anyway.

1. The collect_cmp_types() function has been modified to optionally
   ignore NULL constants in the item list.
2. NULL-skipping code of the Item_func_in::fix_length_and_dec()
   function has been modified to work not only with in_string
   vectors but with in_vectors of other types.
2009-10-05 10:27:36 +05:00
Georgi Kodinov
5992e70623 rpl.rpl_trigger made experimental because of bug #47810 :
rpl.rpl_trigger.test fails with valgrind errors with the innodb plugin
2009-10-04 13:31:55 +03:00
Georgi Kodinov
b2511985ae Make innodb-autoinc.test experimental until bug#47809 is fixed. 2009-10-04 13:16:56 +03:00
Georgi Kodinov
2c14b845ae Disable innodb_information_schema.test until bug #47808 is fixed. 2009-10-04 13:15:53 +03:00
Serge Kozlov
d77bd29c69 WL#3788
It is backport patch.
This adds new test case for testing affects of some variables to replication.
2009-10-03 22:21:44 +04:00
He Zhenxing
62d218edfe Manual merge semi-sync to 5.1-rep+2 2009-10-03 18:50:25 +08:00
He Zhenxing
e9ba06009d Auto merge 2009-10-03 10:07:03 +08:00
He Zhenxing
ab6d244f51 Post fix result file 2009-10-03 09:40:32 +08:00
Serge Kozlov
87a5e68634 WL#4641 Heartbeat testing
This is backport for next-mr.

The patch adds new test cases that cover replication heartbeat testing.
2009-10-02 23:24:40 +04:00
Andrei Elkin
d0c5656eb8 fixing tests results: rpl_ndb_log, rpl_ndb_multi, sp_trans_log; adding replicate-ignore_server_ids specific tests 2009-10-02 16:15:54 +03:00
Alexander Nozdrin
2758bb8aa8 Merge from mysql-trunk-bugfixing. 2009-10-02 16:50:18 +04:00
Alexander Nozdrin
073c5a932d Made two test cases experimental. 2009-10-02 16:48:51 +04:00
Ingo Struewing
c2e1614814 auto-merge 2009-10-02 13:27:48 +02:00
He Zhenxing
04c6e8ff07 Post fix SEMISYNC_PLUGIN_OPT when semi-sync plugins are not found 2009-10-02 19:16:06 +08:00
Mikael Ronstrom
08b57e5387 BUG#47754, used number of parts instead of number of list values as end part for list partitioning in column list partitioning 2009-10-02 11:31:05 +02:00
He Zhenxing
0ec47798fd Backport fixes for the follow tests
binlog_tmp_table
rpl_row_sp006_InnoDB
rpl_slave_status
2009-10-02 17:24:21 +08:00
He Zhenxing
fa7395c9a1 Backport Post fix of result files after push of BUG#34227 2009-10-02 17:12:10 +08:00
He Zhenxing
1b3300d5e9 Backport BUG#34227 Replication permission error message is misleading
According to Jon's comment, add (at least one of) to the error message.
2009-10-02 16:50:05 +08:00
He Zhenxing
b92d459d11 Backport post fix compiler warnings and test failures for BUG#25192 BUG#12190 2009-10-02 16:40:06 +08:00
Bjorn Munch
e46fe1ca21 Bug #47383 let mysql-test-run.pl run innodb tests using the plugin
Alt. solution: let the "InnoDB plugin" combinations apply
Added some alternative plugin paths (I need to move the code anyway)
2009-10-02 10:36:38 +02:00