4614ae5aea
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-03 08:05:30 +02:00
1e54f5a1a7
Work around for bug#27606
2007-04-03 08:04:25 +02:00
2dc02167df
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-03 07:21:42 +02:00
8bf9bf001d
Bug #26783 replication status unknown after cluster or mysqld failure
...
- update the ndb_apply_status table with binlog info
2007-04-03 07:20:55 +02:00
5c0d886248
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into recycle.(none):/src/bug23491_ii/my50-bug23491_ii
2007-04-02 16:25:06 -04:00
b632f87f37
Merge recycle.(none):/src/bug23491_ii/my50-bug23491_ii
...
into recycle.(none):/src/bug23491_ii/my51-bug23491_ii
2007-04-02 16:22:19 -04:00
19a2630641
Minor test cleanup.
2007-04-02 16:21:12 -04:00
31a8bfbe2e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into bodhi.local:/opt/local/work/mysql-5.0-runtime
2007-04-02 22:06:15 +04:00
27d9265c26
BUG#25729 - boolean full text search is confused by NULLs produced by
...
LEFT JOIN
Fixed that in certain situations MATCH ... AGAINST returns false hits
for NULLs produced by LEFT JOIN when there is no fulltext index
available.
2007-04-02 17:26:39 +05:00
1e10ae36c1
After merge fix
2007-04-02 13:57:32 +02:00
54bc9c3d77
Bug#27069 set with identical elements are created
...
added the check for unique elements count in SET
2007-04-02 15:01:19 +05:00
fc904eaead
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-02 11:15:09 +02:00
a4b3a9d31d
Merge naruto.:C:/cpp/bug26174/my51-bug26174
...
into naruto.:C:/cpp/mysql-5.1-runtime
2007-04-02 11:09:32 +02:00
bb9a601829
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:50:39 +02:00
cbe7c63fc7
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-02 10:45:51 +02:00
cb3091c166
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:42:08 +02:00
c731bad918
Cset exclude: tsmith@siva.hindu.god|ChangeSet|20070328212513|13373
2007-04-02 10:39:23 +02:00
9692592143
Fix spelling error
2007-04-02 10:17:29 +02:00
a37acf9146
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-02 10:15:44 +02:00
a5bc60f559
Bug#27049 Race condition in test mysqlbinlog.test
...
Remove the setting of --local-load parameter for mysqlbinlog and leave that to the testcases
to decide what params to use.
2007-04-02 10:14:45 +02:00
f85f0950a0
Bug#26174 Server Crash:INSERT ... SELECT ... FROM I_S.GLOBAL_STATUS in Event
...
- Some variables in I_S.GLOBAL_STATUS were depending on a network
connection in order to evaluate. Since no network connection is
present during the execution of an event, this caused the server
to crash.
- The variable function hooks does now verify that the vio-
object is valid before attempting to use it.
2007-04-02 09:51:14 +02:00
898ec87e14
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-04-02 03:56:39 +02:00
8b8a61d77a
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-04-02 03:53:21 +02:00
5534f099f1
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt
2007-04-01 14:00:56 -07:00
579cee7f49
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-03-31 20:07:44 +02:00
b7537e2ac4
New test case shows valgrind failure (disabling this
...
new test case until the valgrind failure is fixed,
reported in bug 27564)
2007-03-31 19:49:05 +02:00
bd86c0f459
Fix to rpl_row_create_table test.
2007-03-31 19:10:25 +02:00
8c1b109cc3
After merge fix.
2007-03-31 20:27:43 +05:00
a12213aa59
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-31 17:18:26 +02:00
d96319299b
Add correct replace
2007-03-31 17:18:03 +02:00
706a7a8fb5
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-31 15:14:13 +02:00
398c24d1a1
Bug#27049 Race condition in test mysqlbinlog.test
...
- Add --local-load option to avoidthat the load data file requested
by mysqlbinlog end up in local var/tmp dir and not in system global
tmpdir
2007-03-31 15:07:48 +02:00
51710387ab
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.1-engines
2007-03-31 17:29:40 +05:00
fcc2b7ae4b
GLOBAL DEBUG variable does not work
2007-03-31 13:48:33 +02:00
dd1ef14cfe
Avoiding SESSION with debug, since it does not work in valgrind
2007-03-31 12:56:03 +02:00
2f0ecd6a14
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-03-31 12:38:20 +02:00
cec17aa0ba
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-31 12:36:50 +02:00
466586472b
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
...
into bk-internal.mysql.com:/data0/bk/mysql-4.1-opt
2007-03-31 09:52:18 +02:00
f297b5d873
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.0-engines
2007-03-31 12:24:28 +05:00
0c5ba6246b
Fixed bug #27154 : memory corruption when using row equalities in where
...
conditions.
When allocating memory for KEY_FIELD/SARGABLE_PARAM structures the
function update_ref_and_keys did not take into account the fact that
a single row equality could be replaced by several simple equalities.
Fixed by adjusting the counter cond_count accordingly for each subquery
when performing substitution of a row equality for simple equalities.
2007-03-31 00:23:03 -07:00
1965530b0e
Test timeout
2007-03-31 09:15:19 +02:00
9a21d1d50a
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-03-31 05:31:35 +02:00
0a68b63735
Merge mysql.com:/home/psergey/bk-trees/mysql-5.0-opt
...
into mysql.com:/home/psergey/mysql-5.1-merge2
2007-03-31 03:12:33 +04:00
bd95e76bac
item.cc, insert_update.result:
...
After merge fix.
2007-03-31 02:57:26 +04:00
f470ac2000
Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
2007-03-31 02:42:40 +04:00
f6f848b9e7
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-03-31 00:17:12 +02:00
9c6dc8c853
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-31 00:15:20 +02:00
dd7e39f441
BUG#26624, pushbuild fixes: Merge to 5.0
2007-03-31 00:48:31 +04:00
dcb2551347
BUG#26624: high mem usage (crash) in range optimizer
...
Pushbuild fixes:
- Make MAX_SEL_ARGS smaller (even 16K records_in_range() calls is
more than it makes sense to do in typical cases)
- Don't call sel_arg->test_use_count() if we've already allocated
more than MAX_SEL_ARGs elements. The test will succeed but will take
too much time for the test suite (and not provide much value).
2007-03-31 00:29:18 +04:00
5533e6e533
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into four.local.lan:/WORK/mysql-5.1-rpl/src-rpl-ddlx
2007-03-30 20:50:14 +02:00
