serg@serg.mylan
c26246b083
after merge fixes
2004-09-07 16:56:31 +02:00
mskold@mysql.com
6fc7cef065
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-07 16:23:17 +02:00
mskold@mysql.com
5827b829b0
Added use of buffer argument in index_read
2004-09-07 16:22:42 +02:00
mskold@mysql.com
19a2eced82
Removed unnecessary condition
2004-09-07 16:21:29 +02:00
marko@hundin.mysql.fi
934a5c0b99
InnoDB: Add configuration option innodb_autoextend_increment
2004-09-07 16:26:38 +03:00
serg@serg.mylan
413a8753e2
merged
2004-09-07 15:18:53 +02:00
guilhem@mysql.com
168e4c9c6b
when we update thd->db in replication, it's safer to update thd->db_length too.
...
This does not fix any known bug, but is still a good idea.
2004-09-07 14:57:54 +02:00
tomas@poseidon.(none)
7d192fcbd7
fixed NdbConnection::restart and made use of it in ha_ndbcluster
...
added testcase
2004-09-07 12:30:11 +00:00
hf@deer.(none)
bff3ed00f8
Code cleanup
2004-09-07 17:28:26 +05:00
hf@deer.(none)
b40ca99668
Fix for bug #5136(Geometry object corrupted after the query)
2004-09-07 16:44:25 +05:00
serg@serg.mylan
30b7504330
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-09-07 13:37:29 +02:00
tomas@poseidon.(none)
2fdb262c4a
fixed and added test case for bug#5431
...
+ fix for support of multiple mgmt servers
2004-09-07 10:54:31 +00:00
magnus@neptunus.(none)
84aec2faba
Merge msvensson@build.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql/mysql-4.1
2004-09-07 12:46:16 +02:00
magnus@neptunus.(none)
8788f96ecb
Fix for INSERT with multiple values and start/end_bulk_insert
2004-09-07 12:45:19 +02:00
bar@mysql.com
2c86049dec
Bug #5228 ORDER BY CAST(enumcol) sorts incorrectly under certain conditions
2004-09-07 15:42:19 +05:00
magnus@neptunus.(none)
a9531f60d7
Only include debug print routines in debug mode
2004-09-07 12:23:06 +02:00
jani@rhols221.adsl.netsonic.fi
e04e50b6b7
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
2004-09-07 11:40:48 +03:00
jani@rhols221.adsl.netsonic.fi
56b4c31633
Fixed Bug#3645, "PROCEDURE ANALYSE() recommends illegal
...
FLOAT columns".
2004-09-07 11:40:27 +03:00
ram@gw.mysql.r18.ru
04fd903157
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2631
2004-09-07 12:53:12 +05:00
hf@deer.(none)
c0458bb3b6
A set of mysql_home_path-related fixes
2004-09-07 11:55:34 +05:00
guilhem@mysql.com
de5d1e780e
Fix of previous push.
2004-09-06 23:20:33 +02:00
guilhem@mysql.com
f25d3fca92
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0-opt
2004-09-06 22:47:50 +02:00
guilhem@mysql.com
99444c3311
Replacing class Disable_binlog by macros. Patch already approved by Monty.
2004-09-06 22:47:26 +02:00
guilhem@mysql.com
e2aca8cbea
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-09-06 22:30:58 +02:00
guilhem@mysql.com
01ad1bb569
Dependency fix. We observed that doing any change to class THD in sql_class.h resulted in mysqld going crazy (parsing errors,
...
query cache errors in query_cache.test). This is because sql_yacc.cc depends on several .h files but those were not listed in
the dependencies of sql_yacc.o. The present patch does fix the issue; but my auto*-expert colleagues may have a better one.
2004-09-06 22:30:16 +02:00
serg@serg.mylan
130d2fd57f
bug#5389 merge.test fails on qnx - uninitalized variable in myrg_open()
2004-09-06 22:20:40 +02:00
tomas@poseidon.(none)
77cd417c7e
fixed so that ndbcluster and mysqld can be started independently
...
fixed some error codes in Ndb so that 4009-cluster failure is returned when cluster is not up
2004-09-06 18:30:57 +00:00
tomas@poseidon.(none)
41bd91a409
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-06 10:47:04 +00:00
tomas@poseidon.(none)
2192d179d2
added ndb_mgm_destroy_configuration call
...
fixed memory leak in object map
fixed uninitialized value blobs_pending
2004-09-06 10:46:23 +00:00
bell@sanja.is.com.ua
5d42c492d6
fixed temporary table processing expresions of subqueries and removed wrong restrictions of field resolving (BUG#5326)
2004-09-06 13:00:24 +03:00
ram@gw.mysql.r18.ru
ab9843e217
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5291
2004-09-06 13:58:22 +05:00
magnus@neptunus.(none)
4f655b1c53
Added debug printout's to ha_ndbcluster
2004-09-06 10:33:12 +02:00
joreland@mysql.com
aa4402dd80
merge
2004-09-06 07:43:31 +02:00
bell@sanja.is.com.ua
ad6ad34b45
memory leak fixed
2004-09-05 10:57:26 +03:00
serg@serg.mylan
62c2f1c161
sql_print_error cleanup
2004-09-04 20:17:09 +02:00
monty@mysql.com
9d8555c0f0
Merge with 4.0 to get latest bug fixes
2004-09-04 15:59:49 +03:00
konstantin@mysql.com
bdec2c603b
A fix for bug#4368 '"like" fails in PreparedStatement, crashes
...
server': the bug occurs when arguments of LIKE function are in
differentcharacter sets. If these character sets are compatible,
we create an item-converter. In prepared mode, this item
needs to be created in memory of current prepared statement.
2004-09-03 23:28:49 +04:00
paul@kite-hub.kitebird.com
38f462ae6f
sql_yacc.yy:
...
Allow FROM or IN in SHOW KEYS, as in other SHOW statements.
2004-09-03 10:56:55 -05:00
tomas@poseidon.(none)
73366eafc5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into poseidon.(none):/home/tomas/mysql-4.1-ndb
2004-09-03 15:12:34 +00:00
tomas@poseidon.(none)
caf79dacfe
renamed ha_recovery_logging to ha_enable_transaction
...
added tests to alter table for "large" alter tables and truncates in ndbcluster
added debug printout in restart() in ndbcluster
added flag THD::transaction.on to enable/disable transaction
2004-09-03 15:11:09 +00:00
ram@gw.mysql.r18.ru
f91ca0bd66
A fix (Bug #4980 : union statement with () union () order by produces wrong explain).
2004-09-03 19:59:29 +05:00
ram@gw.mysql.r18.ru
c9d97272ed
A fix (Bug #5291 : float -> string, truncation, sometimes without warning).
2004-09-03 19:38:16 +05:00
ram@gw.mysql.r18.ru
3c85a363e5
A fix (bug #2631 : mlockall called after dropping root permissions).
2004-09-03 19:26:11 +05:00
joreland@mysql.com
eff2fa5ee5
Remove usage of row count (as it trashes _all_ explain & table status)
...
Use order by
2004-09-03 14:46:39 +02:00
jan@hundin.mysql.fi
a48db602dd
Fixed unique prefix key bug for multibyte character sets (BUG #4521 ) for
...
InnoDB. This fixes also a second part of the same problem with prefix keys
on a multibyte string column for InnoDB.
2004-09-03 15:26:29 +03:00
joreland@mysql.com
62dae75094
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-03 13:56:11 +02:00
joreland@mysql.com
c90fdd44a9
Added support for HA_READ_ORDER +
...
Added table statistics
2004-09-03 13:55:40 +02:00
igor@rurik.mysql.com
5625988ca3
Merge rurik.mysql.com:/home/igor/mysql-4.0
...
into rurik.mysql.com:/home/igor/dev/mysql-4.0-0
2004-09-02 22:07:07 -07:00
igor@rurik.mysql.com
f888026fdc
select.result, select.test:
...
Added a test case for bug #5333 .
null_key.result, key_primary.result:
Made covering index usable for const tables.
sql_select.cc:
Made covering index usable for const tables:
downported the corresponding code from 4.1.
Simultaneously fixed bug #5333 reported for 4.1.
The bug was due to the fact that field index in join
structures was always set to 0 for const tables.
2004-09-02 22:06:30 -07:00
monty@mysql.com
936eb4b4f4
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-09-03 02:26:00 +03:00