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

13917 Commits

Author SHA1 Message Date
ingo@mysql.com
26c4e82fee Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-aid
2006-04-08 10:48:33 +02:00
kent@mysql.com
91d28a6d36 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-04-08 04:37:59 +02:00
kent@mysql.com
f957d8e282 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-04-08 04:29:17 +02:00
aelkin@dl145j.mysql.com
61377e953d Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  dl145j.mysql.com:/tmp/5.0.21-bug17284-temp_table
2006-04-07 22:42:55 +02:00
igor@rurik.mysql.com
0d2e911204 Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-07 13:22:07 -07:00
igor@rurik.mysql.com
fb3b768205 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  rurik.mysql.com:/home/igor/mysql-5.0
2006-04-07 13:07:40 -07:00
konstantin@mysql.com
a81ea4a830 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/opt/local/work/mysql-4.1-16365
2006-04-07 23:50:45 +04:00
konstantin@mysql.com
518993312c A fix and a test case for Bug#16365 "Prepared Statements: DoS with
too many open statements". The patch adds a new global variable
@@max_prepared_stmt_count. This variable limits the total number
of prepared statements in the server. The default value of
@@max_prepared_stmt_count is 16382. 16382 small statements
(a select against 3 tables with GROUP, ORDER and LIMIT) consume 
100MB of RAM. Once this limit has been reached, the server will 
refuse to prepare a new statement and return ER_UNKNOWN_ERROR 
(unfortunately, we can't add new errors to 4.1 without breaking 5.0). The limit is changeable after startup
and can accept any value from 0 to 1 million. In case
the new value of the limit is less than the current
statement count, no new statements can be added, while the old
still can be used. Additionally, the current count of prepared 
statements is now available through a global read-only variable 
@@prepared_stmt_count.
2006-04-07 23:37:06 +04:00
joerg@mysql.com
f8d524cdbc Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mtr-4.1
2006-04-07 21:07:53 +02:00
konstantin@mysql.com
15b591561f A fix and a test case for Bug#16248 "WHERE (col1,col2) IN ((?,?))
gives wrong results". Implement previously missing 
Item_row::cleanup. The bug is not repeatable in 5.0, probably 
due to a coincidence: the problem is present in 5.0 as well.
2006-04-07 22:26:25 +04:00
joerg@mysql.com
a0c3f51c10 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/M50/mtr-5.0
2006-04-07 20:26:12 +02:00
aelkin@mysql.com
bfbd922eb8 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0.21-bug17284-temp_table
2006-04-07 21:21:23 +03:00
joerg@mysql.com
e246f0402f Merge mysql.com:/M50/mtr-5.0 into mysql.com:/M51/clone-5.1 2006-04-07 19:56:23 +02:00
joerg@mysql.com
4a5985e694 Manual merge. 2006-04-07 19:50:07 +02:00
aelkin@mysql.com
d881fb36b9 Bug#17284 erroneous temp table cleanup on slave.
Idea of the fix is for master to send FD event with `created' as 0
     to reconnecting slave (upon slave_net_timeout, no master crash) to avoid destroying temp tables.
     In a case of a connect by slave to the master after its crash temp tables have been already
     cleaned up so that slave can not keep `orphan' temp tables.
2006-04-07 20:44:37 +03:00
joerg@mysql.com
657d1bd182 Manual merge. 2006-04-07 19:42:46 +02:00
joerg@mysql.com
a7edbc647e mysql-test/mysql-test-run.sh : Provide info about the options used. 2006-04-07 19:27:19 +02:00
igor@rurik.mysql.com
f053b7c9d0 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0
into  rurik.mysql.com:/home/igor/mysql-5.0
2006-04-07 10:19:09 -07:00
ingo@mysql.com
2697018c5b Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-aid
2006-04-07 14:39:49 +02:00
joerg@mysql.com
a663acb13f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/merge-5.1
2006-04-07 14:05:49 +02:00
joerg@mysql.com
24bf40caec Null-merge, as the changes in question were backports from 5.1. 2006-04-07 13:58:45 +02:00
joerg@mysql.com
945599f3cf Manual merge. 2006-04-07 13:44:43 +02:00
joerg@mysql.com
65f4595e9a mysql-test/mysql-test-run.pl : Add option "with-ndbcluster-only" (ignored). 2006-04-07 13:34:39 +02:00
kroki@mysql.com
6222ca41a5 Bug#15933: max_used_connections is wrong after FLUSH STATUS if connections are cached
After FLUSH STATUS max_used_connections was reset to 0, and haven't
been updated while cached threads were reused, until the moment a new
thread was created.

The first suggested fix from original bug report was implemented:

  a) On flushing the status, set max_used_connections to
  threads_connected, not to 0.

  b) Check if it is necessary to increment max_used_connections when
  taking a thread from the cache as well as when creating new threads
2006-04-07 15:30:40 +04:00
joerg@mysql.com
df09a0cedc Manual merge. 2006-04-07 13:16:40 +02:00
joerg@mysql.com
7e4d41de58 Perl test script: Avoid some aborts, which made the whole build/test process terminate. 2006-04-07 13:02:15 +02:00
serg@serg.mylan
8db57d7b3d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-07 12:42:57 +02:00
serg@serg.mylan
1620426482 rpl_ndb_delete_nowhere.test requires ndb 2006-04-07 12:38:38 +02:00
andrey@lmy004.
1d816d2cf3 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into lmy004.:/work/mysql-5.1-bug17494-real
2006-04-07 12:29:32 +02:00
joerg@mysql.com
a0541800aa mysql-test/mysql-test-run.sh : Add option "--with-ndbcluster-only" (backport from 5.1) 2006-04-07 12:22:55 +02:00
msvensson@neptunus.(none)
b13c7d2027 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-07 12:16:57 +02:00
msvensson@neptunus.(none)
042e2f811e Merge neptunus.(none):/home/msvensson/mysql/bug13228/my51-bug13228
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-07 12:13:48 +02:00
msvensson@neptunus.(none)
c2f1259834 Merge neptunus.(none):/home/msvensson/mysql/bug13228/my50-bug13228_minimal
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-07 11:46:22 +02:00
andrey@lmy004.
bdfdd38f60 update tests 2006-04-07 11:29:15 +02:00
hartmut@mysql.com
4a4c459fa3 Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1
2006-04-07 11:23:55 +02:00
msvensson@neptunus.(none)
bf5f4a3c05 Bug#13228 open table cache not flushed when table schema changed
- Error 1296 is no longer returned on first select after DROP/CREATE.
2006-04-07 11:18:45 +02:00
hartmut@mysql.com
7ed2c6207a fix for wrong QUARTER calculation in EXTRACT() (Bug #18100) 2006-04-07 11:15:15 +02:00
bar@mysql.com
334af05334 Bug#16319: XML: extractvalue() returns syntax errors for some functions 2006-04-07 14:07:56 +05:00
gluh@eagle.intranet.mysql.r18.ru
4ef7e5b5f7 Fix for bug#18281 group_concat changes charset to binary
skip charset aggregation for order columns
2006-04-07 13:19:31 +05:00
gluh@eagle.intranet.mysql.r18.ru
fe7ea20764 Bug#18469 make test fails on information_schema
move test case for bug 14290 to ctype_ucs test
2006-04-07 12:32:24 +05:00
andrey@lmy004.
7bd09ac24d manual merge 2006-04-07 09:18:29 +02:00
andrey@lmy004.
36cfa4dfa1 fix for bug #17494 (The algorithm for calculating execution times is not fully correct)
This also should fix 17493 and 17346, and probably 16397 (not tested).
WL#1034 (Internal CRON)
(post-review commit)
2006-04-07 09:08:58 +02:00
bar@mysql.com
9bf1fb4c19 Bug#18285: ExtractValue not returning character data within <![CDATA[]]> as expected 2006-04-07 11:04:33 +05:00
igor@rurik.mysql.com
28b7b96a8f Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-06 15:31:30 -07:00
igor@rurik.mysql.com
9bd0b97824 Fixed bug #15917: unexpected complain for a NIST test case.
The problem was due to the fact that with --lower-case-table-names set to 1 
the function find_field_in_group did not convert the prefix 'HU' in
HU.PROJ.CITY into lower case when looking for it in the group list. Yet the
names in the group list were extended by the database name in lower case.
2006-04-06 15:29:15 -07:00
ingo@mysql.com
33ff3e37a3 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-aid
2006-04-06 20:55:25 +02:00
sergefp@mysql.com
44628436e5 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/psergey/mysql-5.1-bug18558-pnd
2006-04-06 21:26:23 +04:00
sergefp@mysql.com
68bd945ca3 BUG#18558 "Partition pruning results are incorrect for certain class of WHERE clauses" :
* Produce right results for conditions that were transformed to "(partitioning_range) AND
  (list_of_subpartitioning_ranges)": make each partition id set iterator auto-reset itself
  after it has returned all partition ids in the sequence 
* Fix "Range mapping" and "Range mapping" partitioning interval analysis functions to 
  correctly deal with NULL values.
2006-04-06 21:23:33 +04:00
joerg@mysql.com
73a0ae9d9b Backport of 5.1 test options "--with-ndbcluster" and "--with-ndbcluster-only" as dummies (ignored). 2006-04-06 18:42:07 +02:00
ingo@mysql.com
5c689e3382 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-aid
2006-04-06 14:38:49 +02:00