ramil@mysql.com
120dd92b03
workaround (bug #9613 : Some read-only variables are selectable, others are not).
2005-08-26 13:23:32 +05:00
patg@radha.local
6b4baf48a5
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into radha.local:/Users/patg/mysql-build/mysql-4.1
2005-08-26 03:14:56 +02:00
patg@radha.local
efff75ed1a
ha_blackhole changes, same patch as http://lists.mysql.com/internals/27878 , per brian
2005-08-26 02:09:56 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
ff5d26d777
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 23:24:16 +03:00
jonas@eel.(none)
c2b8f4ada3
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-25 13:37:55 +02:00
jonas@eel.(none)
ded7670e5a
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-25 13:34:20 +02:00
jonas@eel.(none)
7fe87018b4
bug#12027 - ndb
...
When detecting corrupt schema file.
Make sure to close it (as it will be opened later when rewriting a clean copy)
2005-08-25 13:16:29 +02:00
tomas@poseidon.ndb.mysql.com
f0b27795e4
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-25 13:05:32 +02:00
tomas@poseidon.ndb.mysql.com
90778fc857
config:
...
changed tomas default checkout
2005-08-25 13:04:53 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e767eb330e
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-08-25 12:08:26 +03:00
monty@mishka.mysql.com
9605c5dba2
Add back changes lost in merge
...
(Faster test)
2005-08-25 10:19:06 +03:00
monty@mishka.local
0c5ca9be62
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-25 09:39:09 +03:00
monty@mishka.local
6773d24704
Remove function that was accidently added back
2005-08-25 09:03:41 +03:00
serg@sergbook.mysql.com
714b27c71c
merged
2005-08-25 00:08:02 +04:00
serg@sergbook.mysql.com
909247a95f
memroot: trash the memory in free_root()
2005-08-24 23:07:06 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
fe977b0cd0
Several fixes for Netware.
2005-08-24 22:03:34 +03:00
monty@mishka.local
17654cd7af
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-24 20:55:54 +03:00
monty@mishka.local
842de6ea45
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.local:/home/my/mysql-4.1
2005-08-24 19:53:40 +03:00
monty@mishka.local
8e6aa0e7ea
Review fixes
2005-08-24 19:37:27 +03:00
jimw@mysql.com
006e5b770b
Merge mysql.com:/home/jimw/my/mysql-4.1-12302
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-24 08:50:12 -07:00
heikki@hundin.mysql.fi
10adc6b562
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-08-24 18:07:52 +03:00
heikki@hundin.mysql.fi
4bedb3091c
subselect2.result:
...
Update test result to reflect the fix of Bug #12779 : EXPLAIN SELECT of a subquery is now different
2005-08-24 18:05:54 +03:00
joerg@mysql.com
8e756ecc4c
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-08-24 16:30:26 +02:00
heikki@hundin.mysql.fi
2310ef6938
Merge hundin.mysql.fi:/home/heikki/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-08-24 17:30:25 +03:00
heikki@hundin.mysql.fi
9f72d504b4
ha_innodb.cc:
...
Fix bug #12779 : never give a row count estimate of 0 to the MySQL query optimizer, as then left join optimizer may beleive it KNOWS that the table is empty; note that this fix may change query optimization of many other queries where one table is empty; note that the proper fix would be to make the query optimizer to know that the row count estimates it receives really are just estimates, it cannot assume they are certain
2005-08-24 17:27:46 +03:00
joerg@mysql.com
bf000026b9
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-08-24 16:13:48 +02:00
joerg@mysql.com
d8078165b0
Merge
2005-08-24 16:11:38 +02:00
kent@mysql.com
4d2cc6e503
Merge
2005-08-23 18:06:24 +02:00
serg@sergbook.mysql.com
1fbb96ea97
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2005-08-23 14:16:17 +04:00
tomas@poseidon.ndb.mysql.com
653e99dea2
removed ndb grep from configure .in
2005-08-23 12:16:16 +02:00
tomas@poseidon.ndb.mysql.com
28e3fe8759
enabled make of ndb_redo_log_reader
2005-08-23 11:50:24 +02:00
jimw@mysql.com
f70beef6c7
Use the hostname with which the user authenticated when determining which
...
user to update with 'SET PASSWORD = ...'. (Bug #12302 )
2005-08-22 15:48:50 -07:00
evgen@moonbone.local
3831bb56df
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/11718-bug-4.1-mysql
2005-08-22 15:46:14 +04:00
jonas@eel.(none)
05fdd166f0
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-22 13:35:00 +02:00
joerg@mysql.com
ddcbf609c4
Ensure that a failing test does not stop testing or the whole RPM build process.
2005-08-22 12:48:01 +02:00
serg@sergbook.mysql.com
eadb86d56f
after pull cleanup
2005-08-22 13:20:02 +04:00
jonas@eel.(none)
a58c0e7dae
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-21 16:35:27 +02:00
elliot@mysql.com
d9e3ad09e5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1
2005-08-20 22:33:45 -04:00
sasha@asksasha.com
e038bfe8ff
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1
2005-08-20 16:09:59 -06:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
5340e04661
Bug #12460 Table Full
...
On 64 bit platforms the changed statement doesn't work
so making sure that the larger value is first and using
subtraction is a quick and backwards-compatible fix of this
line.
2005-08-20 10:07:46 -04:00
igor@rurik.mysql.com
2c2f18b98b
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-19 15:07:51 -07:00
elliot@mysql.com
bbbb56df8f
Fix ctype_cp932 test to be deterministic on different machines.
2005-08-19 17:55:28 -04:00
patg@radha.local
7a43a0f54d
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into radha.local:/Users/patg/mysql-build/mysql-4.1.clean
2005-08-19 23:44:40 +02:00
igor@rurik.mysql.com
55fd68ccd7
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-08-19 12:10:34 -07:00
elliot@mysql.com
d9efe655ed
Bug#11338 Fixes from review (identical functionality).
2005-08-19 14:49:34 -04:00
igor@rurik.mysql.com
2d32b77693
distinct.test, distinct.result:
...
Added test cases for bug #12625 .
sql_select.cc:
Fixed bug #12625 .
Fixed invalid removal of constant items from the DISTINCT
list in the function create_distinct_group.
2005-08-19 01:57:22 -07:00
jonas@eel.(none)
3aede000a2
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-19 10:13:35 +02:00
jonas@eel.(none)
bf835c89c2
ndb -
...
remove grep from Makefile
2005-08-19 10:12:44 +02:00
jonas@eel.(none)
24be1c1524
jonas -
...
Fix checkout properties
2005-08-19 09:04:30 +02:00
jonas@eel.(none)
178a76fab4
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-19 07:58:54 +02:00