tomas@poseidon.ndb.mysql.com
0da4ee9131
Merge
2005-02-07 08:54:35 +01:00
tomas@poseidon.ndb.mysql.com
4873adace0
Corrected fragmentation calculation to take into account that LQH creates "2 fragments per fragment" in 4.1 and 5.0
...
+added some comments to ndb fragmentation calulation
2005-02-07 08:51:27 +01:00
bell@sanja.is.com.ua
0a8595df42
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2005-02-06 13:17:12 +02:00
bell@sanja.is.com.ua
1853c2fe89
fixed test 'subselect' in case when innodb is not compiled in (thanks HF who niticed it)
2005-02-06 13:06:12 +02:00
guilhem@mysql.com
8c508c25a2
result update after 4.1->5.0 merge
2005-02-05 19:49:02 +01:00
guilhem@mysql.com
a70adb5d2a
Merge
2005-02-05 18:07:50 +01:00
jimw@mysql.com
be593c3251
Update test result
2005-02-05 08:54:13 -08:00
jimw@mysql.com
3c10ccd3f7
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-02-05 07:52:55 -08:00
sergefp@mysql.com
b9704ce78a
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-outer-joins-cleanup
2005-02-05 18:18:06 +03:00
sergefp@mysql.com
bc1fdfa402
Outer joins cleanup: Remove TABLE::outer_join and use TABLE::maybe_null only (2nd patch after Monty's comments).
2005-02-05 18:16:29 +03:00
mskold@mysql.com
34e04c8c4c
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-02-05 15:48:28 +01:00
mskold@mysql.com
4dcae5694c
Fix for bug#8315 NdbScanFilter cmp method only works for strings of exact word boundry length
2005-02-05 15:47:06 +01:00
guilhem@mysql.com
b97a519d72
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-02-05 15:29:38 +01:00
monty@mysql.com
23bf186c70
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-02-05 16:06:29 +02:00
monty@mysql.com
80b3e02462
Fixed bug detected by sp-tests
...
Cleanup during reviews of new pushed code
2005-02-05 16:05:46 +02:00
sergefp@mysql.com
fb113b94e4
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug7816
2005-02-05 01:53:12 +03:00
sergefp@mysql.com
72c473ec58
Merge mysql.com:/home/psergey/mysql-4.1-bug7816
...
into mysql.com:/home/psergey/mysql-5.0-bug7716
2005-02-05 01:52:17 +03:00
konstantin@mysql.com
e531136c1f
A fix for Bug#6273 "building fails on link": we should not use
...
CLIENT_LIBS in mysql_config as CLIENT_LIBS point to builddir when
we use the bundled zlib.
2005-02-05 01:21:16 +03:00
guilhem@mysql.com
3f9c4a913c
Backport of ChangeSet 1.1845 05/02/04 13:53:16 guilhem@mysql.com +1 -0 from 5.0.
...
Proposal to fix this problem: when using libmysqlclient, you must call mysql_server_end() to nicely free memory at the end
of your program; it however sounds weird to call a function named *SERVER_end* when you're the CLIENT (you're not ending the server, you're ending
your ability to talk to servers). So here I add two defines which should be more generic names. Our manual
mentions these functions only for libmysqld API so needs some fixing, and then we can close BUG#8099 and BUG#6149.
2005-02-04 23:07:10 +01:00
guilhem@mysql.com
44c2dcff36
Fix for BUG#8055 "Trouble with replication from temporary tables and ignores":
...
when we close the session's temp tables at session end, we automatically write to binlog *one* DROP TEMPORARY TABLE *per tmp table*.
2005-02-04 22:43:54 +01:00
jimw@mysql.com
14bb626dff
Update test results
2005-02-04 12:59:02 -08:00
jimw@mysql.com
f98a2c27a1
Merge
2005-02-04 12:01:30 -08:00
jimw@mysql.com
8c8553af81
Merge changes
2005-02-04 11:59:02 -08:00
jimw@mysql.com
bd9239d4d7
Merge mysql.com:/home/jimw/my/mysql-4.1-8029
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-04 10:41:56 -08:00
jimw@mysql.com
b509f2b373
Merge mysql.com:/home/jimw/my/mysql-4.1-6067
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-04 10:39:13 -08:00
jimw@mysql.com
7a60d16ff9
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-04 10:38:13 -08:00
mysqldev@mysql.com
79b88ead4a
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-04 18:45:02 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
fdee674124
Merge Bug#7310 from 4.0
2005-02-04 17:33:53 +00:00
tulin@mysql.com
d017a604fe
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-04 17:32:18 +01:00
kent@mysql.com
d1abda58b3
mysql-test-run.sh:
...
USE_RUNNING_SERVER should be set to 0 or 1
2005-02-04 17:24:18 +01:00
serg@serg.mylan
fab6f51faa
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-04 17:15:09 +01:00
hf@deer.(none)
40fe0b3971
Embedded version of test fixed
2005-02-04 19:12:15 +04:00
serg@serg.mylan
47f354bca7
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-02-04 15:31:39 +01:00
serg@serg.mylan
cc1ee6475f
indexless boolean fulltext search was depending on default_charset_info - Bug#8159
...
ftbw->off wasn't cleared on reinit - Bug#8234
2005-02-04 15:24:06 +01:00
marko@hundin.mysql.fi
96bbd613c9
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/mysql-5.0
2005-02-04 16:13:46 +02:00
msvensson@neptunus.homeip.net
c9d7cd043b
Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
...
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra
2005-02-04 15:13:45 +01:00
msvensson@neptunus.homeip.net
94978c214a
Updated after review.
2005-02-04 15:08:08 +01:00
marko@hundin.mysql.fi
bf5cacf85f
InnoDB: A small cleanup: remove two duplicate rec_get_offsets() calls
2005-02-04 15:44:09 +02:00
tulin@mysql.com
2339b328fc
ha_ndbcluster.cc:
...
fixed change in struct in 4.1->5.0 merge
2005-02-04 14:33:08 +01:00
mysqldev@mysql.com
753ea29f86
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/mysqldev/tulin/mysql-4.1
2005-02-04 14:29:52 +01:00
mysqldev@mysql.com
e09f50d752
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/home/mysqldev/tulin/mysql-5.0
2005-02-04 14:29:46 +01:00
mysqldev@mysql.com
abf7837fbb
resolved merge conflict
2005-02-04 14:27:09 +01:00
tomas@poseidon.ndb.mysql.com
27a69e573a
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-04 14:27:08 +01:00
tomas@poseidon.ndb.mysql.com
7fd685ffe8
added test to trigger drifferent fragmentations in ndb
...
corrected documentation on fragmentation
set "fragmentation medium" to mean 2 fragments per node instead of 1
set default fragmentation to small instead of medium
bug#8284 adjust fragmentation to max_rows
2005-02-04 14:25:08 +01:00
gluh@gluh.mysql.r18.ru
b0bf195064
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
2005-02-04 16:24:00 +03:00
guilhem@mysql.com
bb37aab73a
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.0-clean
2005-02-04 13:55:08 +01:00
guilhem@mysql.com
cb23d3d064
Proposal to fix this problem: when using libmysqlclient, you must call mysql_server_end() to nicely free memory at the end of your program; it however
...
sounds weird to call a function named *SERVER_end* when you're the CLIENT (you're not ending the server, you're ending your ability to talk to servers).
So here I add two defines which should be more generic names. This was longly discussed with Konstantin, Serg, Brian. The problem started from
a post on valgrind-users list: http://sourceforge.net/mailarchive/forum.php?thread_id=5778035&forum_id=32038 ; our manual mentions these functions
only for libmysqld API so needs some fixing, and then we can close BUG#8099 and BUG#6149.
2005-02-04 13:53:16 +01:00
gluh@gluh.mysql.r18.ru
e9ce96c5cd
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-4.1
2005-02-04 15:47:12 +03:00
gluh@gluh.mysql.r18.ru
34915f7a91
A fix: bug#6931: Date Type column problem when using UNION-Table
...
bug#7833: Wrong datatype of aggregate column is returned
2005-02-04 15:31:36 +03:00
ramil@mysql.com
0d7228fff2
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1
2005-02-04 15:53:14 +04:00