Commit graph

15448 commits

Author SHA1 Message Date
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
838254be52 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18750
2006-04-11 09:36:02 -04:00
jimw@mysql.com
4ab9c02971 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-10 20:18:12 -07:00
igor@rurik.mysql.com
0f2a1f0db8 Merge rurik.mysql.com:/home/igor/dev/mysql-5.0-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-04-10 17:48:17 -07:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
0f9676426c manual merge 2006-04-10 20:48:15 -04:00
jimw@mysql.com
0647a26ade Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 16:17:46 -07:00
jimw@mysql.com
a159a55c2c Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 14:30:00 -07:00
igor@rurik.mysql.com
406b29b6e0 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-10 13:04:25 -07:00
jimw@mysql.com
fec9005e87 Merge mysql.com:/home/jimw/my/mysql-5.0-13601
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-10 11:23:30 -07:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
84575fe0ba BUG#18750: Various problems with partition names, quotation marks 2006-04-10 13:48:58 -04:00
gluh@eagle.intranet.mysql.r18.ru
2c1043c9e0 Fix for bug#18753 Partitions: auto_increment fails
Current auto increment value is placed in partition in which latest
record was saved. So to get auto_increment they have to scan
all partitions and return max value.
2006-04-10 20:54:42 +05:00
aivanov@mysql.com
bb94bb30d0 Fixed BUG#15868: InnoDB hangs under 200 threads making INSERTs: 'thread thrashing'.
Applied changes due Heikki Tuuri.
2006-04-10 19:47:41 +04:00
mikael@c-4908e253.1238-1-64736c10.cust.bredbandsbolaget.se
6e16cfa01d BUG#15561: Possible to strange things with partitions defined although no partition support compiled in
Added an #ifdef to ensure we get syntax error when using partitioned synytax and no partition support is compiled in.
2006-04-10 10:00:08 -04:00
aelkin@mysql.com
5b6708e3ba Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-09 19:38:59 +03:00
aelkin@mysql.com
95d1d4b5c3 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-09 19:35:31 +03:00
aivanov@mysql.com
2d5dd11852 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/bugs/mysql-5.1-15758
2006-04-09 20:19:40 +04:00
aivanov@mysql.com
61c7e4bac5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/bugs/mysql-5.0-15758
2006-04-09 20:14:29 +04:00
aivanov@mysql.com
1488caeca6 Merge mysql.com:/home/alexi/bugs/mysql-5.0-15758-work
into  mysql.com:/home/alexi/bugs/mysql-5.1-15758
2006-04-09 17:48:47 +04:00
lars@mysql.com
ab71e2ac99 Merge mysql.com:/users/lthalmann/bk/mysql-5.0-release-bug18116
into  mysql.com:/users/lthalmann/bk/mysql-5.0
2006-04-09 10:40:52 +02:00
igor@rurik.mysql.com
17141582d4 Fixed bug #16069.
The function agg_cmp_type in item_cmpfunc.cc neglected the fact that 
the first argument in a BETWEEN/IN predicate could be a field of a view.
As a result in the case when the retrieved table was hidden by a view 
over it and the arguments in the BETWEEN/IN predicates are of 
the date/time type the function did not perform conversion of 
the constant arguments to the same format as the first field argument.
If formats of the arguments differed it caused wrong a evaluation of
the predicates.
2006-04-08 11:42:09 -07:00
aelkin@mysql.com
bac4263629 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1
2006-04-08 15:31:47 +03:00
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
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
aivanov@mysql.com
612266ec90 Fixed BUG#15758: "Holding adaptive search latch in
innobase_query_caching_of_table_permitted()".
 Applied the patch due to Heikki Tuuri.
 Also removed superfluous #ifdefs.
2006-04-07 23:58:17 +04: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
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
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
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
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
serg@serg.mylan
a5ed8bf668 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:13:42 +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
hartmut@mysql.com
7ed2c6207a fix for wrong QUARTER calculation in EXTRACT() (Bug #18100) 2006-04-07 11:15:15 +02: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
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
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
serg@serg.mylan
ec61fe292a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-04-06 22:28:45 +02: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
f962fa5b91 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/psergey/mysql-5.0-bug18237-review
2006-04-06 21:42:33 +04:00
sergefp@mysql.com
be0ebd9e0a Remove redundant code in opt_sum_query() 2006-04-06 21:42:03 +04: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
serg@serg.mylan
c708c11633 fixed reading of free'd memory when opening a table with non-existing plugin 2006-04-06 15:49:00 +02:00
serg@serg.mylan
13902e1de5 Bug#17112 - SHOW PLUGIN should be SHOW PLUGINS 2006-04-06 15:29:39 +02:00
svoj@april.(none)
fb37c30699 Merge april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.1-new
2006-04-06 16:44:26 +05:00
svoj@april.(none)
85ff7bec70 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG14945/mysql-5.0
2006-04-06 15:25:39 +05:00
svoj@april.(none)
209682e051 Fix for bug#14945 "Truncate table doesn't reset the auto_increment
counter".

When TRUNCATE TABLE was called within an stored procedure the
auto_increment counter was not reset to 0 even if straight
TRUNCATE for this table did this.

This fix makes TRUNCATE in stored procedures to be handled exactly
in the same way as straight TRUNCATE. We achieve this by rolling
back the fix for bug 8850, which is no longer needed since stored
procedures don't require prelocked mode anymore (and TRUNCATE is
not allowed in stored functions or triggers).
2006-04-06 15:19:01 +05:00
ingo@mysql.com
c228bd4179 Merge mysql.com:/home/mydev/mysql-5.1-bug18477
into  mysql.com:/home/mydev/mysql-5.1-aid
2006-04-06 08:40:38 +02:00