Commit graph

3284 commits

Author SHA1 Message Date
sergefp@mysql.com
bd04f52552 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-03 20:54:46 +04:00
tomas@mc05.(none)
bf644e1785 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-03 13:15:55 +02:00
hf@deer.(none)
b8cf9f6afe Merging 2004-06-02 19:17:35 +05:00
hf@deer.(none)
7cf1d2596b wl 1562 (To improve RTree indexes)
some changes to make code nicer
2004-06-02 19:11:57 +05:00
tomas@mc05.(none)
783c4f0873 fixed naming error 2004-06-02 12:37:43 +02:00
tomas@poseidon.ndb.mysql.com
d58d6e2b1c collapsed ndb start/stop scripts in mysql-test-run + ndb bin name changes 2004-06-02 10:37:42 +00:00
tomas@poseidon.bredbandsbolaget.se
d369c2f241 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
2004-06-02 00:56:59 +00:00
tomas@poseidon.bredbandsbolaget.se
8d7d4c077b several ndb make changes, see respective file 2004-06-02 00:54:58 +00:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
tomas@mc05.(none)
4971ce3ec2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-01 22:39:40 +02:00
monty@mysql.com
53d05f4adb Removed compiler warnings 2004-06-01 23:39:39 +03:00
monty@mysql.com
197fcf1ee4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-01 22:30:03 +03:00
monty@mysql.com
017096695a Update version number
Fixed serbian error messages
Fix for windows regarding changed variable name
2004-06-01 22:29:46 +03:00
paul@ice.snake.net
7650da7711 README:
Update README URL. (Bug #3678)
2004-06-01 14:18:34 -05:00
hf@deer.(none)
39f69a2126 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ftr
2004-06-01 22:37:39 +05:00
tomas@mc05.(none)
308f40bb98 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-01 18:05:43 +02:00
sergefp@mysql.com
dc38512390 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-06-01 17:29:13 +04:00
bell@sanja.is.com.ua
9f51e30054 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-05-28 21:34:09 +03:00
bell@sanja.is.com.ua
266dd53da2 if exists should not be used inside test
removed influence of some tests on other tests
2004-05-28 21:31:51 +03:00
ram@gw.mysql.r18.ru
8297e4b4a0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3738
2004-05-28 16:38:06 +05:00
ram@gw.mysql.r18.ru
605962a938 a fix.
(Bug#3738: SQL_CALC_FOUND_ROWS ignores WHERE if LIMIT used,
 Bug#3845: wrong FOUND_ROWS result)
2004-05-28 15:01:16 +05:00
tomas@mc05.(none)
d1467d7a42 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-05-28 03:24:29 +02:00
monty@mysql.com
ccc4171276 Portability fix (using 'char' as argument to C functions may give warnings) 2004-05-28 02:36:43 +03:00
monty@mysql.com
be7f1a3570 merge with 4.0 to get fix for hpux 2004-05-28 02:04:07 +03:00
monty@mysql.com
a7c17eee46 Portability fix for 32 bit file systems 2004-05-28 00:32:55 +03:00
monty@mysql.com
518019f511 Remove some code from sql_yacc.cc that doesn't do anything except produce warnings on VC++ 2004-05-28 00:03:19 +03:00
monty@mysql.com
e9b7e3baa8 merge with 4.0 to get fix to VC++ project files 2004-05-27 23:45:22 +03:00
serg@serg.mylan
1998dd786e backport bug#2708 fix from 4.1 2004-05-27 21:14:59 +02:00
hf@deer.(none)
15ea09b79d WL#1163 (Make spatial code separable for other parts)
--with-geometry and
--with-embedded-privilege-control
configure switches added
2004-05-27 20:31:30 +05:00
tomas@mc05.(none)
67da12a8fe Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-05-27 11:36:08 +02:00
tomas@poseidon.(none)
9d762e369a ndb in mysql-test fix 2004-05-27 08:05:10 +00:00
tomas@poseidon.(none)
5645b7967a several ndb automake changes, see respective file 2004-05-27 07:04:45 +00:00
monty@mysql.com
c342318c6e Fixed test to not crash when ndb is not in use 2004-05-26 20:56:39 +03:00
monty@mysql.com
98741a50df Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-26 19:13:12 +03:00
monty@mysql.com
7d8f8bc77b Changed prototype of killed_ptr() to make it more portable
Applied patches for Netware
2004-05-26 19:12:49 +03:00
magnus@neptunus.(none)
c5d388f150 Small fix, addin order by to get predicatble output from select 2004-05-26 14:34:40 +02:00
magnus@neptunus.(none)
2daebc70cc Fix after running on a 4-node system. 2004-05-26 14:22:49 +02:00
magnus@neptunus.(none)
28c8ac884b Corrected index_flags returned when index are created with USING HASH
Updated ndb_ test cases
2004-05-25 14:40:51 +02:00
magnus@neptunus.(none)
2bee88a4c2 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/magnus/mysql-4.1
2004-05-25 12:25:22 +02:00
sergefp@mysql.com
ef260fa754 Merge 2004-05-24 21:13:38 +04:00
sergefp@mysql.com
b142c8edd0 Added replication tests 2004-05-24 21:12:05 +04:00
monty@mysql.com
eca917b79c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-05-24 15:00:12 +03:00
monty@mysql.com
56c0258536 After merge fixes
Remove compiler warnings
Update windows project files
2004-05-24 14:42:34 +03:00
dlenev@brandersnatch.localdomain
8966ff8e73 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bcut
2004-05-21 20:55:09 +04:00
sergefp@mysql.com
f75b1adece Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
2004-05-21 04:31:07 +04:00
sergefp@mysql.com
fb17025b3e WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2) 2004-05-21 04:27:50 +04:00
ram@gw.mysql.r18.ru
98c10ced6a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3728
2004-05-20 14:22:49 +05:00
monty@mysql.com
a4b0ec1ede Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
sergefp@mysql.com
8e2ff7d135 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/dbdata/psergey/mysql-4.0-root
2004-05-19 23:20:42 +04:00
bell@sanja.is.com.ua
bd010b1ec3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
2004-05-19 17:09:40 +03:00