Commit graph

14621 commits

Author SHA1 Message Date
tomas@poseidon.(none)
24ceb26d4d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-14 09:15:43 +00:00
tomas@poseidon.(none)
aecd1e5d7f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-14 08:55:09 +00:00
tomas@poseidon.(none)
21a4b1b4e6 moved all ndb thread specific data into new placeholder
new methods to keep "records" up to date
unset flag HA_NOT_EXACT_COUNT to make handler read "records" field, for count() optim and join optimization
new methods to keep "records" up to datecorrect record field in ndbcluster handler
new method for ndbcluster handler to store/retrieve table and thread specific data
changed local hash to store new table_info object, with placeholders for local data, instead of TableImpl
hanged deleteKey to return ponter to deleted object
moved heavy global cache fetch from inline to separate method
2004-09-14 08:52:21 +00:00
hf@deer.(none)
4e5c179ff1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5396
2004-09-14 11:37:16 +05:00
hf@deer.(none)
64a3e17f34 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5396
2004-09-14 11:35:57 +05:00
hf@deer.(none)
118669b418 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.4815
2004-09-14 10:07:17 +05:00
hf@deer.(none)
7ec92d572c Merging 2004-09-14 10:04:35 +05:00
joerg@mysql.com
481f8d5b1c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2004-09-13 23:31:15 +02:00
hf@deer.(none)
610913c8b9 Additional fix about paths 2004-09-13 21:49:41 +05:00
joreland@mysql.com
29c5bfb21e Fix ; when compiling release 2004-09-13 18:46:56 +02:00
joreland@mysql.com
bcfbf6038a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-09-13 18:07:51 +02:00
joerg@mysql.com
563c556694 Replace 'sete_id(__)' calls by 'setre_id(-1,__)' to solve the
missing prototyped problem (bug#5521).
2004-09-13 16:32:47 +02:00
serg@serg.mylan
a8b38dd71d Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-09-13 16:20:42 +02:00
sergefp@mysql.com
ca0fc0b4f4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug-tina
2004-09-13 16:26:01 +04:00
serg@serg.mylan
962c228a68 select send_error cleanup (not everything is fixed) 2004-09-13 11:22:01 +02:00
serg@serg.mylan
4a9defa31e un-reserving "RETURNS" 2004-09-13 11:19:38 +02:00
serg@serg.mylan
68bcfc95b7 indentation cleanup 2004-09-13 11:16:34 +02:00
ram@gw.mysql.r18.ru
9684914094 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5428
2004-09-13 13:34:18 +05:00
joreland@mysql.com
671360403a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-09-13 09:59:58 +02:00
bar@mysql.com
49728cce7e mysql.cc:
Bug #5536: wrong server character set in "status" command
  More character set variables.
2004-09-13 12:51:08 +05:00
ram@gw.mysql.r18.ru
0480c17730 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5428
2004-09-13 12:39:04 +05:00
bar@mysql.com
134b5c7d75 Persian collation, contibuted by Jody McIntyre 2004-09-13 12:07:01 +05:00
joreland@mysql.com
77445739ad Merge mysql.com:/home/jonas/src/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1
2004-09-13 06:49:16 +02:00
joreland@mysql.com
f003b3244e Fix dict error code on list tables
Check g_ndb before deleting it
Wait until ready(10) if get mgm connection
2004-09-13 06:40:25 +02:00
sergefp@mysql.com
13fdbc99cf Fix for BUG#5117:
* Renamed handler::estimate_number_of_rows to handler::estimate_rows_upper_bound function, which can also return "unknown"
 * made filesort to use full sort buffer if number of rows to sort is not known.
2004-09-13 06:14:25 +04:00
joreland@mysql.com
4d44bea861 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-12 09:24:53 +02:00
joreland@mysql.com
460859fc12 Fix command line options 2004-09-12 09:23:05 +02:00
gluh@gluh.mysql.r18.ru
3b7378f992 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
2004-09-12 10:41:06 +04:00
paul@ice.snake.net
5099b678c5 libmysql.c:
Fix typos noticed while poking around in file.
2004-09-11 14:38:23 -05:00
serg@serg.mylan
0570fa4eab Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-09-11 13:57:02 +02:00
gluh@gluh.mysql.r18.ru
c1d25e32ec Fix for bug #5513: FIND_IN_SET fails if set ends with a comma 2004-09-11 15:48:23 +04:00
ingo@mysql.com
ad12db7678 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-bug4788
2004-09-11 12:31:28 +02:00
bell@sanja.is.com.ua
c6634707c4 Put Ramil patch to be able push me code (test suite already is included in query_cache.test) 2004-09-10 22:19:52 +03:00
bell@sanja.is.com.ua
796b625420 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-09-10 21:40:18 +03:00
tomas@poseidon.(none)
74336d596f removed shaky test case 2004-09-10 17:40:02 +00:00
tomas@poseidon.(none)
cf3cb70d30 configure.in:
bumped up version to 3.5.1
2004-09-10 17:29:10 +00:00
ingo@mysql.com
6c47f075c7 BUG#4788 - show create table provides incorrect statement.
Added code to adjust the field_length of user variables 
in dependence on the field type.
Aded new constants for numeric field widths.
2004-09-10 18:56:47 +02:00
tomas@poseidon.(none)
eeae012b4e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-10 15:04:40 +00:00
hf@deer.(none)
2eec5d460d Fix for bug #5396(libmysql depends on SSL)
Since libmysqld has libmysql's capabilities it needs lssl to compile
2004-09-10 19:55:43 +05:00
tomas@poseidon.(none)
8df4fa5d43 bug#5435 2004-09-10 14:55:42 +00:00
bell@sanja.is.com.ua
24e1464d5a information about different variables agged to query cache (BUG#5515, BUG#5394) 2004-09-10 16:28:18 +03:00
tomas@poseidon.(none)
513805d8ae removed debug printout that slipped in 2004-09-09 21:53:01 +00:00
tomas@poseidon.(none)
69695656a1 fixed compile error 2004-09-09 20:43:42 +00:00
tomas@poseidon.(none)
dfe6033f8e added possibility to use comma-separated connectstring
compile error/warning fixes
added force of heartbeat
added ability to force heartbeat
2004-09-09 19:52:03 +00:00
tomas@poseidon.(none)
6b8f55a565 Merge 2004-09-09 16:43:11 +00:00
tomas@poseidon.(none)
a5fa9d8692 main.cpp:
removed shhor switch for nodaemon
2004-09-09 16:41:20 +00:00
tomas@poseidon.(none)
3015cb361b MgmtSrvr.cpp:
Added ability to force heartbeat
2004-09-09 16:40:15 +00:00
tomas@poseidon.(none)
abf5add3f5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-09 16:34:25 +00:00
paul@kite-hub.kitebird.com
6e161cbf88 mysql_protocols.result:
fix test result.
2004-09-09 11:22:23 -05:00
tulin@build.mysql.com
9698903eb5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into build.mysql.com:/users/tulin/mysql-4.1-ndb-merge
2004-09-09 16:22:47 +02:00