jonas@perch.ndb.mysql.com
7d54ea6b49
ndb -
...
remove copy/paste method in NdbIndexOperation
2007-01-30 19:28:32 +01:00
jonas@perch.ndb.mysql.com
3a3ed75655
ndb - minor style fixes
2007-01-30 19:26:40 +01:00
df@kahlann.erinye.com
16865c1ad2
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-5.1.15-and-opt-merge
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2007-01-30 18:43:23 +01:00
gkodinov/kgeorge@rakia.gmz
066b2d8151
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B25643-5.0-opt
2007-01-30 19:30:42 +02:00
mhansson/martin@linux-st28.site
d37b840f9a
This is an empty changeset to trigger a rerun of pushbuild.
2007-01-30 18:07:41 +01:00
jani/jamppa@production.mysql.com
0e9a64684d
Merge bk://localhost:5559
...
into production.mysql.com:/usersnfs/jamppa/mysql-4.0
2007-01-30 17:52:27 +01:00
jani@ua141d10.elisa.omakaista.fi
b3523e398c
Cleanup of thread-type (linuxthread or NTPL) detection code
...
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
2007-01-30 18:52:26 +02:00
tomas@poseidon.mysql.com
2ef4c0a2c9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-30 23:10:14 +07:00
gkodinov/kgeorge@macbook.gmz
a7af53838a
Bug #25643 : SEC_TO_TIME function problem
...
Checking for NULL before calling the val_xxx()
methods only checks for such arguments that are
known to be NULLs at compile time.
The arguments that may or may not contain
NULLs (e.g. function calls and possibly others)
are not checked at all.
Fixed by first calling the val_xxx() method and
then checking for null in SEC_TO_TIME().
In addition QUARTER() was not returning 0 (as all the
val_int() functions do when processing a NULL value).
2007-01-30 17:43:34 +02:00
df@kahlann.erinye.com
95275e28f2
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-25530
2007-01-30 13:57:36 +01:00
df@kahlann.erinye.com
455b903f28
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-25530
2007-01-30 13:53:48 +01:00
monty@mysql.com/narttu.mysql.fi
25e481aed8
Fixed problems detected by pushbuild
2007-01-30 13:52:26 +02:00
tomas@poseidon.mysql.com
bfb0614175
valgrind leak
...
- no injected events if operation is not connected
- remove extra valgrind checks
2007-01-30 15:43:55 +07:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
9755609b7b
Bug#23546, Cluster configured without any arbitration
2007-01-30 13:05:40 +08:00
tomas@poseidon.mysql.com
5f50de1ad0
ndb - added extra valgrind memleak checks to try to track leak
2007-01-30 11:52:37 +07:00
jonas@perch.ndb.mysql.com
0d1f39202d
ndb -
...
two small fixes for TC
1) use static syntax
2) fix attlen handling in unique index
2007-01-30 04:14:07 +01:00
brian@zim.(none)
8ac1d06728
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-29 13:19:51 -08:00
brian@zim.(none)
9fc89facca
Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file). I also fixed a bug where limit was not being reached.
2007-01-29 13:17:30 -08:00
istruewing@chilla.local
42bd03e254
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-01-29 18:47:46 +01:00
istruewing@chilla.local
79e099e8a6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-01-29 17:20:18 +01:00
mhansson/martin@linux-st28.site
3aad724315
Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt
...
into linux-st28.site:/home/martin/mysql/src/5.1o-bug20604-tp
2007-01-29 16:16:20 +01:00
df@kahlann.erinye.com
8fa8c6f46b
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-opt
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-5.1.15-and-opt-merge
2007-01-29 15:35:20 +01:00
df@kahlann.erinye.com
db86c6036b
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1.15-release
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-5.1.15-and-opt-merge
2007-01-29 15:33:19 +01:00
monty@mysql.com/narttu.mysql.fi
1f6d91c5a6
after merge fixes
...
Removed
2007-01-29 16:13:18 +02:00
mhansson/martin@linux-st28.site
6d7a609742
BUG#20604: FORCE INDEX uses keys disabled by ALTER TABLE
...
The function that checks whether we can use keys for aggregates,
find_key_for_maxmin(), assumes that keys disabled by ALTER TABLE
... DISABLE KEYS are not in the set table->keys_in_use_for_query.
I.E., if a key is in this set, the optimizer assumes it is free to
use it.
The bug is that keys disabled with ALTER TABLE ... DISABLE KEYS still
appear in table->keys_in_use_for_query When the TABLE object has been
initialized with setup_tables(). Before setup_tables is called, however,
keys that are disabled in the aforementioned way are not included in
TABLE::keys_in_use_for_query.
The provided patch changes the code that updates keys_is_use_for_query so
that it assumes that keys_is_use_for_query already takes into account all
disabled keys, and generally all keys that should be used by the query.
2007-01-29 15:07:11 +01:00
df@kahlann.erinye.com
7ce0bd7a5e
apply holyfoot's patch for BUG#25895
2007-01-29 14:47:38 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
6391613d32
bug #25895 (compiling the embedded server fails on some 64-bit platforms)
...
it can't be compile everywhere if we just cast pointer to pthread_t
So now we use correct pthread_self() value as the pthread_t and
pointer where we need to identify the thread exactly.
2007-01-29 17:39:28 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
6679490dc6
bug #25890 (mysqltest_embedded crashes on start)
...
binlog_filter and rpl_filter are initialized in server's 'main' function
which doesn't work in the embedded server. So this code moved to
function working in both cases.
2007-01-29 15:26:27 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
e3f4f02b64
bug #25492 (Invalid deallocation in mysql_stmt_fetch)
...
Operating with the prepared statements we don't alloc MYSQL_DATA structure,
but use MYSQL_STMT's field instead (to increase performance by reducing
malloc calls).
So we shouldn't free this structure as we did before.
2007-01-29 11:48:31 +04:00
monty@narttu.mysql.fi
bb464613ce
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-01-29 01:57:07 +02:00
monty@mysql.com/narttu.mysql.fi
410fc81a72
After merge fixes
...
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
2007-01-29 01:47:35 +02:00
jonas@perch.ndb.mysql.com
3f2a9eeba2
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-28 22:03:42 +01:00
jonas@perch.ndb.mysql.com
6b738220d9
ndb - Fix so that node version is recomputed at node failure
2007-01-28 21:56:17 +01:00
baker@bk-internal.mysql.com
bf7efc3ce3
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-28 00:48:11 +01:00
df@kahlann.erinye.com
eadd2c4eef
Build fix for sunfire100b. This can go when BUG#14420 is fixed.
2007-01-27 22:07:52 +01:00
df@kahlann.erinye.com
a4208cdc1c
BUG#25890 put previous fix in better place
2007-01-27 21:26:28 +01:00
df@kahlann.erinye.com
26c6d2d231
BUG#25895 compiling the server with embedded fails on several 64-bit platforms
...
temporary fix
2007-01-27 20:16:15 +01:00
df@kahlann.erinye.com
508d7da976
BUG#25890 mysqltest_embedded crashes on start
...
very temporary fix
2007-01-27 13:12:59 +01:00
df@kahlann.erinye.com
199f7b46b6
fix order in spec file changelog
2007-01-27 12:46:20 +01:00
monty@narttu.mysql.fi
8a80e36ac3
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00
igor@olga.mysql.com
e897780919
Fixed bug #24420 .
...
Objects of the classes Item_func_is_not_null_test and Item_func_trig_cond
must be transparent for the method Item::split_sum_func2 as these classes
are pure helpers. It means that the method Item::split_sum_func2 should
look at those objects as at pure wrappers.
2007-01-26 17:10:45 -08:00
baker@bk-internal.mysql.com
b64060f70d
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-27 00:36:40 +01:00
brian@zim.(none)
08e93132c4
Two things:
...
1) Two small windows cleanups for Archive.
2) Patch from Calvin for Falcon to be able to have its own I_S loaded. One example added for this, does hello world.
2007-01-26 15:36:39 -08:00
brian@zim.(none)
8820333ec3
For performance reasons we remove the ability in unique indexes on autoincrements to remove the ability to insert key lower then the current autoincrement value.
2007-01-26 14:17:45 -08:00
brian@zim.(none)
24d9d866c2
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-26 12:49:20 -08:00
brian@zim.(none)
6829b2a5a6
This fixes a bug in show create table displaying auto_increment field when it should not.
...
It also refactors the test case for Archive (removed two bad tests).
2007-01-26 11:15:16 -08:00
brian@zim.(none)
3cca6ad8c1
Fixed a warning. Added the -A option so that the autoincrement could be set outside of the file.
2007-01-26 10:17:53 -08:00
igor@olga.mysql.com
1ad63bdfec
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug24653
2007-01-26 09:33:19 -08:00
gluh@eagle.(none)
30d927dab9
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.1
2007-01-26 16:46:40 +04:00
gluh@eagle.(none)
67db27537b
Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1
2007-01-26 16:46:01 +04:00