database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
61,283 Commits 3,346 Branches 1,099 Tags
ef5ef725e359ec5714f36b4ca2a4e6282f198b88
Commit Graph

25988 Commits

Author SHA1 Message Date
Alexander Nozdrin
ef5ef725e3 Disable partition_debug_sync temporarily awaiting a patch from Mattias. 2010-03-01 13:07:42 +03:00
Alexander Nozdrin
b73cba223b Manual merge from mysql-next-mr. 
Conflicts:
  - sql/item.cc
 2010-03-01 13:06:11 +03:00
Alexander Nozdrin
1913b715bc Manual merge from mysql-trunk-merge. 
Conflicts:
  - sql/share/Makefile.am
 2010-03-01 12:39:44 +03:00
Alexander Barkov
06ca4ae33d Mergine from mysql-next-me 2010-02-27 11:43:32 +04:00
Alexey Kopytov
031657c694 Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. 
Conflicts:

Text conflict in scripts/Makefile.am
Text conflict in sql/share/Makefile.am
 2010-02-26 16:06:31 +03:00
Sergey Glukhov
1bb6ea1727 automerge 2010-02-26 16:19:05 +04:00
Sergey Glukhov
fe94dec679 Bug#50995 Having clause on subquery result produces incorrect results. 
The problem is that cond->fix_fields(thd, 0) breaks
condition(cuts off 'having'). The reason of that is
that NULL valued Item pointer is present in the
middle of Item list and it breaks the Item processing
loop.
 2010-02-26 15:39:25 +04:00
Evgeny Potemkin
a0723c0665 Auto-merged fox for the bug#50843. 2010-02-26 14:19:44 +03:00
Evgeny Potemkin
cc01fc3f5f Bug#50843: Filesort used instead of clustered index led to 
performance degradation.

Filesort + join cache combination is preferred to full index scan because it
is usually faster. But it's not the case when the index is clustered one.

Now test_if_skip_sort_order function prefers filesort only if index isn't
clustered.
 2010-02-26 14:17:00 +03:00
Alexander Nozdrin
93287d6162 Auto-merge from mysql-next-mr. 2010-02-26 12:33:19 +03:00
Alexander Nozdrin
6e4f3deb72 Disable rpl_semi_sync on Windows due to Bug 49557. 2010-02-26 09:06:43 +03:00
Alexander Nozdrin
bf87590104 Fix mysqld--help-notwin.result. 2010-02-25 23:10:42 +03:00
Alexander Nozdrin
16fd5b9b05 Auto-merge from mysql-next-mr. 2010-02-25 23:00:37 +03:00
Alexander Nozdrin
c962fdf25c Auto-merge from mysql-next-mr. 2010-02-25 22:58:57 +03:00
Gleb Shchepa
79d8de67a9 Bug #45360: wrong results 
Propagation of a large unsigned numeric constant
in the WHERE expression led to wrong result.

For example,
"WHERE a = CAST(0xFFFFFFFFFFFFFFFF AS USIGNED) AND FOO(a)",
where a is an UNSIGNED BIGINT, and FOO() accepts strings,
was transformed to "... AND FOO('-1')".

That has been fixed.

Also EXPLAIN EXTENDED printed incorrect numeric constants in
transformed WHERE expressions like above. That has been
fixed too.
 2010-02-25 23:13:11 +04:00
Alexey Kopytov
3dc164664a Automerge. 2010-02-25 19:26:30 +03:00
Alexey Kopytov
735de9ea7e Bug #50335: Assertion `!(order->used & map)' in eq_ref_table 
The problem was in an incorrect debug assertion. The expression 
used in the failing assertion states that when finding 
references matching ORDER BY expressions, there can be only one 
reference to a single table. But that does not make any sense, 
all test cases for this bug are valid examples with multiple 
identical WHERE expressions referencing the same table which
are also present in the ORDER BY list. 
 
Fixed by removing the failing assertion. We also have to take 
care of the 'found' counter so that we count multiple 
references only once. We rely on this fact later in 
eq_ref_table().
 2010-02-25 18:48:53 +03:00
Georgi Kodinov
6f3770ca3e merge 2010-02-25 17:12:15 +02:00
Georgi Kodinov
b5ae1327f7 Backport of the fix for bug #49552 to 5.0-bugteam 2010-02-25 16:57:15 +02:00
Jonathan Perkin
26e77e0027 Some CMake packaging fixes: 
- Remove INSTALL-BINARY from installed docs directory, we provide a copy
   in the root directory (but perhaps this should be revisited later).

 - Disable audit_null and daemon_example plugins.

 - Fix the docs directory.

 - Remove mysql-test/Makefile.in

 - Build and install mysql_tzinfo_to_sql

 - Remove share/charsets/languages.html
 2010-02-24 19:19:24 +00:00
Alexander Barkov
3275a27d50 Removing compilation-dependent query. 2010-02-24 19:42:40 +04:00
Alexander Barkov
9c5e3b83c9 Added forgotten test dependencies 2010-02-24 19:07:08 +04:00
Alexander Nozdrin
d2591c2371 Auto-merge from mysql-next-mr-bugfixing. 2010-02-24 16:53:36 +03:00
Alexander Nozdrin
04b8cb1882 Manual merge from mysql-trunk-merge. 
Conflicts:
  - client/mysql.cc
  - client/mysqldump.c
  - configure.in
  - mysql-test/r/csv.result
  - mysql-test/r/func_time.result
  - mysql-test/r/show_check.result
  - mysql-test/r/sp-error.result
  - mysql-test/r/sp.result
  - mysql-test/r/sp_trans.result
  - mysql-test/r/type_blob.result
  - mysql-test/r/type_timestamp.result
  - mysql-test/r/warnings.result
  - mysql-test/suite/rpl/r/rpl_sp.result
  - sql/mysql_priv.h
  - sql/mysqld.cc
  - sql/sp.cc
  - sql/sql_base.cc
  - sql/sql_table.cc
  - sql/sql_trigger.cc
  - sql/sql_view.cc
  - sql/table.h
  - sql/share/errmsg.txt
  - mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
 2010-02-24 16:52:27 +03:00
Alexander Nozdrin
73b591a0b5 Update result file for funcs_1.storedproc. 2010-02-24 15:53:09 +03:00
Alexey Kopytov
456926721a Automerge from the parent tree. 2010-02-24 15:40:45 +03:00
Alexey Kopytov
a814ee238d Post-merge fix. 2010-02-24 15:39:11 +03:00
Alexander Barkov
0bf7ac328f Merging WL#1213 into mysql-next-mr-bar2 2010-02-24 13:52:59 +04:00
Alexander Barkov
13c32771e7 Backporting WL#1213 2010-02-24 13:15:34 +04:00
Alexander Nozdrin
b416a55376 Auto-merge from mysql-trunk-bugfixing. 2010-02-24 10:32:07 +03:00
Marc Alff
3425e9ef38 Fixed tests for windows 2010-02-24 00:22:19 -07:00
Marc Alff
9d5deb076a Bug#10143 Perror not showing error description 
Backport to 5.5.99
 2010-02-23 17:45:49 -07:00
Marc Alff
22e9e95a7c Bug#31767 DROP FUNCTION name resolution 
Backport to 5.5.99
 2010-02-23 11:43:26 -07:00
Alexander Nozdrin
b6e0f92f05 Auto-merge from mysql-next-mr-bugfixing. 2010-02-23 18:49:21 +03:00
Vladislav Vaintroub
7684386f11 merge 2010-02-23 15:54:52 +01:00
Alexander Nozdrin
8c9153008a Manual merge from mysql-trunk. 2010-02-23 17:06:06 +03:00
Alexey Kopytov
92a5dd0323 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 
Conflicts:

Text conflict in client/mysqltest.cc
Text conflict in configure.in
Text conflict in mysql-test/include/mtr_warnings.sql
 2010-02-23 16:26:45 +03:00
Alexander Nozdrin
3f4d6f9aa7 Add ignore pattern for valgrind messages. 2010-02-23 16:18:24 +03:00
Vladislav Vaintroub
ac3a0f0df6 merge, CMake bugfixes, remove sp-error from experimental 2010-02-23 13:50:45 +01:00
Magne Mahre
a341ec7400 Clean-up in the sys_vars test suite after 
WL#5154 and WL5182

Two result files in the sys_vars suite wasn't 
properly updated after the change in
deprecation text
 2010-02-23 12:33:20 +01:00
Vladislav Vaintroub
e605213c2a Bug#51393 : remove mtr_fix_privilege_tables from MTR v1 2010-02-22 19:39:36 +01:00
Tatiana A. Nurnberg
f91a5fe5c6 auto-merge 2010-02-22 17:57:19 +00:00
Tatiana A. Nurnberg
51e47e1317 revert 48525 2010-02-22 16:58:56 +00:00
Bjorn Munch
38e811b839 merge from 5.1-mtr 2010-02-22 14:52:11 +01:00
Alexander Nozdrin
ff68d48279 Manual merge from mysql-next-mr. 
Conflicts:
  - mysql-test/r/mysqld--help-notwin.result
  - mysql-test/r/mysqld--help-win.result
 2010-02-22 16:22:31 +03:00
Tatiana A. Nurnberg
0a992ff561 auto-merge 2010-02-22 12:31:50 +00:00
Alexander Nozdrin
672cb8d9b8 Make sp-error.test experimental on Windows due to Bug 43201. 
The patch is ready and will be pushed via -bugfixing.
 2010-02-22 14:40:41 +03:00
Alexey Kopytov
8c31c4d16c Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2010-02-22 00:33:11 +03:00
Alexander Nozdrin
36d6330aa1 Auto-merge from mysql-next-mr. 2010-02-21 22:36:05 +03:00
Alexander Nozdrin
b29eb4e282 Auto-merge from mysql-next-mr. 2010-02-21 21:34:09 +03:00