msvensson@pilot.(none)
2028c2b696
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 14:39:59 +02:00
msvensson@pilot.(none)
f164a136e1
Fix typo: '$$' => '$'
2007-08-29 14:39:40 +02:00
gkodinov/kgeorge@magare.gmz
56b6db1fd2
Bug #30244 : row_count/found_rows does not replicate well
...
The functions ROW_COUNT/FOUND_ROWS are indeed not safe to be used in
statement based replication.
Added code to declare them as such and switch the statement they're in
to row based logging for mixed mode.
2007-08-29 14:54:32 +03:00
gkodinov/kgeorge@magare.gmz
30585c3d2e
Bug #30393 : Test "group_by" fails with a difference in "row count"
...
and strategy (explain)
The fix for WL3527 adds tests that test if the index usage hints
combinations don't cause syntax errors.
The EXPLAIN for one of these tests can be affected by the size of the
rowid on the disk (affected by the presence of large file support).
Fixed to avoid the platform dependent test result by removing the
irrelevant columns from the EXPLAIN result.
2007-08-29 14:46:49 +03:00
anozdrin/alik@ibm.
290d724943
Test case for Bug#13675: DATETIME/DATE type in store proc param
...
seems to be converted as varbinary.
The bug has been already fixed. This CS just adds a test case for it.
2007-08-29 14:57:59 +04:00
tomas@whalegate.ndb.mysql.com
8ea0a23978
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-08-29 12:51:25 +02:00
msvensson@pilot.(none)
758f2fc71e
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 12:47:28 +02:00
msvensson@pilot.(none)
aa57f6106c
Remove unportable use of "system rm"
2007-08-29 12:47:00 +02:00
msvensson@pilot.(none)
9ffb05dbbf
Remove unportable "system rm"
2007-08-29 12:44:43 +02:00
msvensson@pilot.(none)
e10fb4ffb3
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 11:55:03 +02:00
msvensson@pilot.(none)
bce2f6bba8
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-29 11:54:26 +02:00
msvensson@pilot.(none)
044f7a3270
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 11:54:21 +02:00
msvensson@pilot.(none)
523cddeec3
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 11:53:36 +02:00
msvensson@pilot.(none)
b68689172f
Remove unportable use of "exec chmod"
2007-08-29 11:53:15 +02:00
msvensson@pilot.(none)
387990f78d
Add 'mtr_rmtree'
2007-08-29 11:51:34 +02:00
gkodinov/kgeorge@magare.gmz
625c44fe67
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30377-5.0-opt
2007-08-29 12:47:24 +03:00
gkodinov/kgeorge@magare.gmz
7d0c8bbb66
Addendum to the 5.1 merge of the fix
...
for bug 30377: use the function instead of
the complex condition.
2007-08-29 12:39:42 +03:00
mhansson/martin@linux-st28.site
f672e5bca6
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bugx/my50-bugx
2007-08-29 10:49:19 +02:00
gkodinov/kgeorge@magare.gmz
acf0ebe69f
Merge magare.gmz:/home/kgeorge/mysql/work/B30377-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/B30377-5.1-opt
2007-08-29 11:38:05 +03:00
tomas@whalegate.ndb.mysql.com
afb817e95a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-target-5.1.22
2007-08-29 09:50:20 +02:00
tomas@whalegate.ndb.mysql.com
53eaf05bb2
Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
...
- reverting patch as there where unknows sideeffects that we do not have time to follow up on just now
2007-08-29 09:44:37 +02:00
stewart@flamingspork.com[stewart]
3dbcaa6ff1
[PATCH] Bug#30681 mgmapi CHECK_TIMEDOUT_RET should be DBUG_CHECK_TIMEDOUT_RET
...
Index: ndb/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================
2007-08-29 14:30:21 +10:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
56902d5251
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge
2007-08-29 10:49:31 +08:00
malff/marcsql@weblab.(none)
d25340c93d
Manual merge
2007-08-28 15:56:12 -06:00
malff/marcsql@weblab.(none)
bdc65c4325
Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-08-28 15:53:43 -06:00
davi@moksha.local
74fcc76028
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
...
into moksha.local:/Users/davi/mysql/push/mysql-5.0-runtime
2007-08-28 18:47:08 -03:00
tsmith@ramayana.hindu.god
9410759277
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-28 13:25:06 -06:00
tsmith@ramayana.hindu.god
044cd7b471
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/b27694/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-28 13:24:31 -06:00
malff/marcsql@weblab.(none)
eec4d248a2
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
2007-08-28 11:46:24 -06:00
malff/marcsql@weblab.(none)
ec9b9a98aa
Bug#30625 (Performance, reduce depth for expressions)
...
This is a performance bug, affecting in particular the bison generated code
for the parser.
Prior to this fix, the grammar used a long chain of reduces to parse an
expression, like:
bit_expr -> bit_term
bit_term -> bit_factor
bit_factor -> value_expr
value_expr -> term
term -> factor
etc
This chain of reduces cause the internal state automaton in the generated
parser to execute more state transitions and more reduces, so that the
generated MySQLParse() function would spend a lot of time looping to execute
all the grammar reductions.
With this patch, the grammar has been reorganized so that rules are more
"flat", limiting the depth of reduces needed to parse <expr>.
Tests have been written to enforce that relative priorities and properties
of operators have not changed while changing the grammar.
See the bug report for performance data.
2007-08-28 11:16:03 -06:00
mhansson/martin@linux-st28.site
2df0485d93
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
...
into linux-st28.site:/home/martin/mysql/src/5.1o-bug30596
2007-08-28 18:17:44 +02:00
tsmith@ramayana.hindu.god
0af6a5fa9e
Fix another compiler warning on Windows in InnoDB.
2007-08-28 10:17:15 -06:00
mhansson/martin@linux-st28.site
98d34d620c
Bug #30596 GROUP BY optimization gives wrong result order
...
The optimization that uses a unique index to remove GROUP BY did not
ensure that the index was actually used, thus violating the ORDER BY
that is implied by GROUP BY.
Fixed by replacing GROUP BY with ORDER BY if the GROUP BY clause contains
a unique index over non-nullable field(s). In case GROUP BY ... ORDER BY
null is used, GROUP BY is simply removed.
2007-08-28 18:01:29 +02:00
gkodinov/kgeorge@magare.gmz
cfaa0983c8
Bug #30377 : EXPLAIN loses last_query_cost when used with UNION
...
Currently the Last_query_cost session status variable shows
only the cost of a single flat subselect. For complex queries
(with subselects or unions etc) Last_query_cost is not valid
as it was showing the cost for the last optimized subselect.
Fixed by reseting to zero Last_query_cost when the complete
cost of the query cannot be determined.
Last_query_cost will be non-zero only for single flat queries.
2007-08-28 18:51:03 +03:00
msvensson@pilot.(none)
3df9790e41
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 16:47:41 +02:00
msvensson@pilot.(none)
4a7087526f
Streamline "do_close_connection" and "do_send_quit"
...
Fix typo, "next_con" -> "con"
2007-08-28 16:47:05 +02:00
msvensson@pilot.(none)
d11d6ea773
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 16:44:51 +02:00
msvensson@pilot.(none)
397fbd0289
Remove unportable constructs in loaddata.test
2007-08-28 16:44:31 +02:00
tomas@whalegate.ndb.mysql.com
5ea9174c50
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-08-28 15:47:12 +02:00
tomas@whalegate.ndb.mysql.com
d7d0d68b78
Bug #30667 result file
2007-08-28 15:44:20 +02:00
tomas@whalegate.ndb.mysql.com
803228a1a8
Bug #30667 ndb table discovery does not work correcly with information schema
...
- the listed file_names are not necessarily on disk, so we need to discover them if they aren't
2007-08-28 15:43:06 +02:00
msvensson@pilot.(none)
dc4d29bf23
Remove unportable construct in loaddata.test
2007-08-28 15:35:42 +02:00
msvensson@pilot.(none)
221dba148e
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 15:33:14 +02:00
msvensson@pilot.(none)
440caf3e10
Remove unportable constructs in loaddata.test
2007-08-28 15:32:44 +02:00
msvensson@pilot.(none)
4a013e295d
Move "analyze_testcase_failure" to mysqltest(since it knows best when
...
to perform this analyzis)
2007-08-28 15:32:13 +02:00
msvensson@pilot.(none)
26afeffa74
Temp disable of icheck
2007-08-28 12:41:25 +02:00
msvensson@pilot.(none)
ccfbae831f
Fix warning
2007-08-28 11:39:29 +02:00
msvensson@pilot.(none)
cae9149d7c
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 11:36:10 +02:00
msvensson@pilot.(none)
bce8ea54ff
Merge pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-28 11:35:22 +02:00
msvensson@pilot.(none)
c2b817013c
Merge pilot.(none):/data/msvensson/mysql/yassl_import/my50-yassl_import
...
into pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812
2007-08-28 11:35:05 +02:00