Commit graph

12639 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)
deaa73fe42 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mm
2004-06-03 16:31:47 +02:00
heikki@hundin.mysql.fi
347a21e118 fil0fil.c:
Make allocation for file path more uniform: always use mem_alloc(), not ut_malloc()
2004-06-03 17:31:46 +03:00
heikki@hundin.mysql.fi
0dced9ea3b os0file.c, fil0fil.c:
Align file i/o buffers for DIRECT_IO; fix mem_alloc()/mem_free() crash bugs that came from Marko's latest cleanup
2004-06-03 17:02:37 +03:00
tomas@mc05.(none)
0fa5156fbf fixes for ndb and make distdir 2004-06-03 16:02:07 +02:00
tomas@mc05.(none)
73a4598cdf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-03 14:45:54 +02:00
bar@bar.intranet.mysql.r18.ru
23aee5621d Unicode collations: WL#916
XML and "collation customization" language parsers.
2004-06-03 17:45:53 +05:00
tomas@mc05.(none)
22e39a53a9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-03 13:22:55 +02:00
joreland@mysql.com
a106a8c7b6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-03 13:22:54 +02: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
autotest@mc01.ndb.mysql.com
63fe3c7e73 Makefile.am:
local flag in ndbapi to set -O2 since problems occur with -O3
pc.hpp, Emulator.hpp, Emulator.cpp, ErrorReporter.cpp:
  USE_EMULATED_JAM -> !NO_EMULATED_JAM
ErrorReporter.hpp:
  removed NDEBUG and removed THREAD_ASSERT
Dbdict.cpp:
  NDB_DEBUG -> VM_TRACE
configure.in:
  cleaned up ndb CXX flags and added optional flag possibility
2004-06-03 13:15:54 +02:00
joreland@mysql.com
2d379b2311 More warnings in atrt 2004-06-03 13:14:03 +02:00
ndbdev@ndbmaster.mysql.com
947abbabb9 Setup connect string 2004-06-03 10:17:52 +02:00
joreland@mysql.com
9bdbd6318a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-06-03 08:13:10 +02:00
joreland@mysql.com
8e88ed19fe Fix for 840, invalid tuple size.
Still don't know reason, but this works
2004-06-03 08:09:04 +02:00
autotest@mc01.ndb.mysql.com
37c78059e9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc01.ndb.mysql.com:/space/mysql-4.1-ndb
2004-06-03 08:04:40 +02:00
autotest@mc01.ndb.mysql.com
e69afe3921 extern"C" bug 2004-06-03 08:03:37 +02:00
joreland@mysql.com
0a69e028b0 Fix for 3910 2004-06-03 03:56:12 +02:00
monty@mysql.com
5ddf741a8d portability fix 2004-06-03 02:13:19 +03:00
monty@mysql.com
eef24c7e43 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-03 01:58:33 +03:00
monty@mysql.com
42c35d4569 Added authentication code that was missed in merge
Added new windows configuration
2004-06-03 01:55:47 +03:00
heikki@hundin.mysql.fi
8dae598aa2 fil0fil.c:
Fix typo spotted by Paul DuBois: 'no continue' -> 'not continue'
2004-06-02 18:19:28 +03: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
joreland@mysql.com
e22b3f24c6 Update atrt to use new names of binaries 2004-06-02 13:11:10 +02: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
monty@mysql.com
4cb62eb001 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-06-02 12:14:36 +03:00
monty@mysql.com
e6c5715126 after merge fixes 2004-06-02 12:13:49 +03:00
tomas@mc05.(none)
2f714683a2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-02 08:24:36 +02:00
joreland@mysql.com
3bee189127 BUG#3662
Fixed bug introduced with upgrade code
2004-06-02 08:24:35 +02:00
tomas@mc05.(none)
6431b94df7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-02 08:16:35 +02:00
heikki@hundin.mysql.fi
a106806324 fil0fil.c:
Stop InnoDB crash recovery if an .ibd file for a table exists in a database directory, but we cannot access it.
2004-06-02 08:44:08 +03: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
tomas@mc05.(none)
a5a20089d9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
2004-06-02 00:28:00 +02:00
serg@serg.mylan
dc5a7f8030 cleanup 2004-06-02 00:27:59 +02:00
serg@serg.mylan
6341c93d77 check_scramble_323 shuold ensure that the scramble has the correct length 2004-06-01 23:58:33 +02: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
greg@mysql.com
3b313f14f2 Fix applied to allow building of 4.0.20 for NetWare 2004-06-01 19:35:09 -01:00
monty@mysql.com
e13c5d049f Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-06-01 23:35:08 +03:00
monty@mysql.com
5b905beee1 Updated version number
Portability fix for netware. (We can't use TRY_RUN when cross compiling)
2004-06-01 23:34:47 +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
9011bdb4bb Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.0
2004-06-01 14:19:38 -05:00
paul@ice.snake.net
7650da7711 README:
Update README URL. (Bug #3678)
2004-06-01 14:18:34 -05:00
hf@deer.(none)
12c217bb21 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.ftr
2004-06-01 22:47:28 +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