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
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
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
tsmith@ramayana.hindu.god
0af6a5fa9e
Fix another compiler warning on Windows in InnoDB.
2007-08-28 10:17:15 -06: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
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
msvensson@pilot.(none)
ec421a02a9
Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117
...
- Merge sslaccept and sslconnect.
- Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has
succeeded, this avoids having to revert anything and thus protects
against "close_active_vio" in the middle.
- Add some variance to the testcase
2007-08-28 11:34:43 +02:00
msvensson@pilot.(none)
bb4ce6d212
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-08-28 11:16:26 +02:00
rafal@quant.(none)
88b8ad10c5
A fix for handling endianess in Field_blob::unpack().
2007-08-28 10:37:29 +02:00
msvensson@pilot.(none)
394d9a0e55
Import yaSSL version 1.7.2
...
- Fix bug#27265
- Support for fixing bug#18441
2007-08-28 10:35:55 +02:00
rafal@quant.(none)
7d72a132b6
Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22
...
into quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22-merge
2007-08-28 10:24:40 +02:00
rafal@quant.(none)
c55627e9e2
BUG#21842: Exclude Rows_log_event members used in event application if
...
not compiled as a replication server - a fix from rpl clone now applied
to 5.1.22 tree.
2007-08-28 10:14:45 +02:00
tsmith@sita.local
b42e80e351
Post-merge fixes
2007-08-28 01:02:57 -06:00
tomas@whalegate.ndb.mysql.com
17f751ed05
correct compile error
2007-08-28 07:55:07 +02:00
tomas@whalegate.ndb.mysql.com
148bd2158a
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-28 07:45:14 +02:00
tomas@whalegate.ndb.mysql.com
037f79a43c
Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
2007-08-28 07:42:43 +02:00
tsmith@ramayana.hindu.god
a009144d43
Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-27 18:41:29 -06:00
tsmith@ramayana.hindu.god
6106226f77
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-27 18:23:44 -06:00
tsmith@ramayana.hindu.god
c87236ce91
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-27 18:20:54 -06:00
tsmith@ramayana.hindu.god
86ef148e6c
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-27 18:19:55 -06:00
tsmith@ramayana.hindu.god
82a3e8cfaf
Fix some Windows compiler warnings.
2007-08-27 18:18:14 -06:00
rafal@quant.(none)
0924d086f7
Merge quant.(none):/ext/mysql/bkroot/mysql-5.1-target-5.1.22
...
into quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22-merge
2007-08-27 22:51:13 +02:00
tsmith@ramayana.hindu.god
2c44def1ee
Bug #30389 : connection_id() always return 0 in embedded server
...
Initialize thd->variables.pseudo_thread_id when a new embedded
thd is created.
2007-08-27 14:31:27 -06:00
tsmith@ramayana.hindu.god
c0fd09224b
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-target-5.1.22
...
into ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X
2007-08-27 14:23:02 -06:00
tsmith@ramayana.hindu.god
7dbef328be
Bug #30412 and Bug #30413
...
Update some tests in the "parts" suite, so they're skipped if the
requisite plugins are not present in the mysqld.
2007-08-27 14:12:12 -06:00
tsmith@ramayana.hindu.god
220cd12f0b
Fixes for the following bugs:
...
Bug #30316 : Some "parts" tests fail because the server uses "--secure-file-priv"
Bug #30341 : Test suite "parts" needs to be adapted to the new rules disallowing many functio
Bug #30408 : Suite "parts" needs bug numbers updated
Bug #30411 : Suite "parts" needs bug numbers updated: ER_UNIQUE_KEY_NEED_ALL_FIELDS_IN_PF
Bug #30576 : part_supported_sql_func_innodb.test tries to LOAD DATA outside of var dir
Bug #30581 : partition_value tests use disallowed CAST() function
Included are some general fixes to allow the "parts" test suite to be run
successfully. This includes disabling a few tests or parts of tests,
cleaning up the test cases and their results, etc. Basically, these tests
have not been run for some time, and had suffered some bit rot.
The bugs were fixed as a single changeset, because in some ways they depend
on each other. I couldn't be sure I'd updated all the error codes (for
bugs 30408 and 30411) without also adapting to the new allowed functions
rules (bug 30341), and vice versa.
2007-08-27 14:08:32 -06:00
rafal@quant.(none)
95bece5d11
Merge quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22
...
into quant.(none):/ext/mysql/bk/mysql-5.1-bug21842-5.1.22-merge
2007-08-27 21:15:20 +02:00
rafal@quant.(none)
3584a4d400
BUG#21842: There was an inconsistency in the use of table->record[0] and
...
table->record[1] buffers inside Rows_log_event::find_row() function.
The patch fixes this.
2007-08-27 20:22:04 +02:00
baker@bk-internal.mysql.com
25c467bf6f
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-08-27 20:20:08 +02:00
tsmith@ramayana.hindu.god
549ed88635
Bug #30648 : Partition handler may not initialize variable used w/ autoincrement
...
A local variable may be used uninitialized in
ha_partition::get_auto_increment(). Initialize it properly.
2007-08-27 11:46:34 -06:00