gkodinov/kgeorge@magare.gmz
092f9d2e55
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30000-5.1-opt
2007-07-27 17:57:29 +03:00
gkodinov/kgeorge@magare.gmz
9e1dd00ff2
Bug #30000 : SHOW commands once again ends up in the
...
slow query log
Disable the SHOW commands to appear in the show query
log.
Update the commands type array.
2007-07-27 17:55:39 +03:00
gkodinov/kgeorge@magare.gmz
e9be3793fb
fixing the 5.1-opt merge of the fix for bug 29571:
...
cannot check the statments in the binlog for row based
replication.
2007-07-27 17:29:48 +03:00
gkodinov/kgeorge@magare.gmz
61a525b6ab
portation of the test case for bug 29571 to cover row replication
2007-07-27 15:36:10 +03:00
gkodinov/kgeorge@magare.gmz
40e0efeba1
5.0-opt -> 5.1-opt merge of the test case for bug 29571:
...
- reset the logs before and after the test.
- cleanup from the previous tests : use the correct schema.
2007-07-27 14:28:36 +03:00
gkodinov/kgeorge@magare.gmz
c8e525b744
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30036-5.1-opt
2007-07-27 12:54:05 +03:00
gshchepa/uchum@gleb.loc
e6c7e7d630
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-27 13:38:11 +05:00
sergefp@pylon.mylan
3301955b6e
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.0-bdb-fix
2007-07-26 20:54:28 +04:00
sergefp@mysql.com
9c8262da33
BUG#28591: make the fix work for BDB tables too:
...
- make ha_berkeley::cmp_ref() take into account that auto-generated PKs
are stored in LSB-first order.
- Remove the temporary code that made the bugfix work for innodb only
2007-07-26 20:52:53 +04:00
gkodinov/kgeorge@magare.gmz
5324d45a10
Bug #30036 : SHOW TABLE TYPES causes the debug client to crash
...
SHOW TABLE TYPES is a (to be deprecated) synonym for
SHOW STORAGE ENGINES.
Fixed to use the right schema table in addition to
issuing a warning.
2007-07-26 18:33:05 +03:00
gkodinov/kgeorge@magare.gmz
f98eb3a634
Addendum to bug 29571: wait for INSERT DELAYED to finish on master
2007-07-26 16:59:21 +03:00
gkodinov/kgeorge@magare.gmz
9bc5e92614
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B29571-5.0-opt
2007-07-26 11:32:27 +03:00
gkodinov/kgeorge@magare.gmz
02fe5e27d2
Bug #29571 : INSERT DELAYED IGNORE written to binary log on
...
the master but on the slave
MySQL can decide to "downgrade" a INSERT DELAYED statement
to normal insert in certain situations.
One such situation is when the slave is replaying a
replication feed.
However INSERT DELAYED is logged even if there're no updates
whereas the NORMAL INSERT is not logged in such cases.
Fixed by always logging a "downgraded" INSERT DELAYED: even
if there were no updates.
2007-07-26 11:31:10 +03:00
gshchepa/uchum@gleb.loc
1339cdb75a
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-26 05:28:10 +05:00
gshchepa/uchum@gleb.loc
2a1d621d2d
Merge gleb.loc:/home/uchum/work/bk/5.1
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-26 05:13:32 +05:00
gshchepa/uchum@gleb.loc
dfbfeeceb3
table.cc, sql_select.cc:
...
Post-merge fix.
2007-07-26 04:41:48 +05:00
gshchepa/uchum@gleb.loc
f129754096
sql_select.cc:
...
Post-merge fix.
2007-07-26 04:08:58 +05:00
gshchepa/uchum@gleb.loc
bb22e3667e
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-26 03:33:43 +05:00
gshchepa/uchum@gleb.loc
3595bbb34c
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-26 01:23:39 +05:00
gshchepa/uchum@gleb.loc
2c9eb1638b
Merge gleb.loc:/home/uchum/work/bk/4.1-opt
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-26 00:04:55 +05:00
kostja@bodhi.(none)
b89f288143
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-24 23:03:33 +04:00
kostja@bodhi.(none)
2b31b6c3e1
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-24 23:01:05 +04:00
kostja@bodhi.(none)
f3ffe963ea
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-24 22:58:05 +04:00
kostja@bodhi.(none)
4c208499a4
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-24 22:57:26 +04:00
evgen@moonbone.local
fd1a43b080
Bug#15130: CREATE .. SELECT was denied to use advantages of the SQL_BIG_RESULT.
...
When the SQL_BIG_RESULT flag is specified SELECT should store items from the
select list in the filesort data and use them when sending to a client.
The get_addon_fields function is responsible for creating necessary structures
for that. But this function was allowed to do so only for SELECT and
INSERT .. SELECT queries. This makes the SQL_BIG_RESULT useless for
the CREATE .. SELECT queries.
Now the get_addon_fields allows storing select list items in the filesort
data for the CREATE .. SELECT queries.
2007-07-24 18:15:44 +04:00
malff/marcsql@weblab.(none)
2aeab16a65
Bug#29993 (Default value of log_output should be 'FILE', not 'TABLE')
...
Changed the default location of the log output to LOG_FILE,
for backward compatibility with MySQL 5.0
2007-07-23 22:01:22 -06:00
gkodinov/kgeorge@magare.gmz
07acfcf557
coding style fix : Index_hint
2007-07-23 19:09:48 +03:00
gkodinov/kgeorge@magare.gmz
33518801fb
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B29644-5.0-opt
2007-07-23 17:07:29 +03:00
igor@olga.mysql.com
5ae1392cb0
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-07-22 23:07:59 -07:00
gkodinov/kgeorge@magare.gmz
bc1a6ba954
table.cc, sql_select.cc:
...
Limit the fix for bug 28591 to InnoDB only
2007-07-23 06:26:57 +03:00
igor@olga.mysql.com
54f3949a27
Fixed bug #29611 .
...
If a primary key is defined over column c of enum type then
the EXPLAIN command for a look-up query of the form
SELECT * FROM t WHERE c=0
said that the query was with an impossible where condition though the
query correctly returned non-empty result set when the table indeed
contained rows with error empty strings for column c.
This kind of misbehavior was due to a bug in the function
Field_enum::store(longlong,bool) that erroneously returned 1 if
the the value to be stored was equal to 0.
Note that the method
Field_enum::store(const char *from,uint length,CHARSET_INFO *cs)
correctly returned 0 if a value of the error empty string
was stored.
2007-07-22 18:26:16 -07:00
gkodinov/kgeorge@magare.gmz
7402fd6e79
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B28951-5.0-opt
2007-07-22 19:23:29 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
57a564673b
Merge bk@192.168.21.1:mysql-4.1-opt
...
into mysql.com:/home/hf/work/29494/my41-29494
2007-07-22 18:16:11 +05:00
holyfoot/hf@hfmain.(none)
336d4848ab
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/29494/my50-29494
2007-07-22 18:13:39 +05:00
holyfoot/hf@hfmain.(none)
6a5b7b6a15
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/29494/my51-29494
2007-07-22 18:02:11 +05:00
holyfoot/hf@hfmain.(none)
56e6ae811f
Merge mysql.com:/home/hf/work/29494/my50-29494
...
into mysql.com:/home/hf/work/29494/my51-29494
2007-07-22 14:03:53 +05:00
holyfoot/hf@hfmain.(none)
14cbdecf7c
Merge mysql.com:/home/hf/work/29494/my41-29494
...
into mysql.com:/home/hf/work/29494/my50-29494
2007-07-22 14:03:18 +05:00
igor@olga.mysql.com
ce9ee1b9f3
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-07-21 15:46:02 -07:00
gshchepa/uchum@gleb.loc
58f0814c3b
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-22 01:58:37 +05:00
gshchepa/uchum@gleb.loc
882bb64fc6
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29338
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-22 01:52:13 +05:00
gshchepa/uchum@gleb.loc
872d21eb1f
sp.test, sp.result:
...
Additional test case fix for bug #29338 .
2007-07-22 01:49:41 +05:00
igor@olga.mysql.com
233d5523ae
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29911
2007-07-21 13:36:33 -07:00
gshchepa/uchum@gleb.loc
f7010479fb
Merge gleb.loc:/home/uchum/work/bk/5.0-opt
...
into gleb.loc:/home/uchum/work/bk/5.1-opt
2007-07-22 00:53:01 +05:00
gshchepa/uchum@gleb.loc
2313bbc304
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29338
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-07-22 00:40:14 +05:00
igor@olga.mysql.com
43dab6b5de
Merge olga.mysql.com:/home/igor/dev-opt/mysql-4.1-opt-bug29911
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug29911
2007-07-21 12:34:18 -07:00
kostja@bodhi.(none)
cbd6e56ffa
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-21 17:57:32 +04:00
kostja@bodhi.(none)
0e728d1463
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-07-21 17:54:23 +04:00
kostja@bodhi.(none)
2ecd75ef24
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.(none):/opt/local/work/mysql-5.0-runtime
2007-07-21 17:52:16 +04:00
joerg@trift2.
8b5f22a0c3
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-07-21 12:36:37 +02:00
igor@olga.mysql.com
07e0cd2f4e
Fixed bug #29911 .
...
This bug manifested itself for join queries with GROUP BY and HAVING clauses
whose SELECT lists contained DISTINCT. It occurred when the optimizer could
deduce that the result set would have not more than one row.
The bug could lead to wrong result sets for queries of this type because
HAVING conditions were erroneously ignored in some cases in the function
remove_duplicates.
2007-07-20 22:56:19 -07:00