ingo@mysql.com
be5dade853
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 15:31:31 +01:00
georg@beethoven.site
3b2bf2f512
Fixes for windows compilation bugs
...
(After review of cs georg:1.1800 by Monty)
2005-01-26 15:19:20 +01:00
tomas@poseidon.ndb.mysql.com
6596744d0f
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-26 15:13:30 +01:00
tomas@poseidon.ndb.mysql.com
259aa7131c
updated show table status usage in ndb tests to become independent on ndb cluster run
2005-01-26 15:07:39 +01:00
ram@gw.mysql.r18.ru
a27208cc03
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2005-01-26 17:40:49 +04:00
tomas@poseidon.ndb.mysql.com
27bc9058ff
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-26 14:40:48 +01:00
tomas@poseidon.ndb.mysql.com
a87e0069ab
added check in ndb tests that require "default" cluster running
...
i.e. ndb_restore
2005-01-26 14:38:13 +01:00
bar@mysql.com
8828884f4c
CSC#4385: slow sorting for UTF8 large table:
...
my_strnxfrm_utf8 now requires 2 bytes per character
in filesort key, instead of 3 bytes per character.
Shorter filesort keys make sorting faster.
2005-01-26 16:34:09 +04:00
ram@gw.mysql.r18.ru
142ed6735f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
2005-01-26 16:26:19 +04:00
tomas@poseidon.ndb.mysql.com
f9d0512fc3
Merge
2005-01-26 13:22:07 +01:00
ram@gw.mysql.r18.ru
4453a6243e
after review fixup (bug #8129 : help.test fails using --ps-protocol)
2005-01-26 16:02:19 +04:00
ram@gw.mysql.r18.ru
f995a526b1
a fix (bug #8129 : help.test fails using --ps-protocol)
2005-01-26 15:11:55 +04:00
tomas@poseidon.ndb.mysql.com
1a331191a3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-26 11:32:22 +01:00
tomas@poseidon.ndb.mysql.com
5779a6a576
Bug#8101 unique indexes which attribute are _not_ specified in the order of the table does not work
2005-01-26 11:31:46 +01:00
serg@serg.mylan
160f254d34
merged
2005-01-26 09:54:12 +01:00
tomas@poseidon.ndb.mysql.com
9259dd1d81
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-26 09:42:52 +01:00
ingo@mysql.com
9daf446b43
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 09:10:34 +01:00
serg@serg.mylan
d8f35cec21
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-01-26 09:05:58 +01:00
serg@serg.mylan
7084b494c4
innobase/include/univ.i
...
remove a change that broke the test
2005-01-26 08:57:43 +01:00
patg@krsna.patg.net
7db99fa559
change to Makefile.am per Serg's request
2005-01-25 23:52:47 -08:00
marko@hundin.mysql.fi
81ce1c8d75
rem0rec.h:
...
Corrected formatting of comments.
rem0rec.ic:
rec_set_info_and_status_bits(): pass arguments to rec_set_info_bits()
in the correct order.
Corrected formatting of comments.
2005-01-25 22:40:20 +02:00
serg@serg.mylan
76f3d6f002
merged
2005-01-25 21:11:04 +01:00
tomas@poseidon.ndb.mysql.com
5f33acc006
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 20:55:29 +01:00
monty@mysql.com
555680e0c5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2005-01-25 21:29:09 +02:00
monty@mysql.com
37168015cd
Cleanups during review
2005-01-25 21:27:51 +02:00
monty@mysql.com
8fe57e7d9b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2005-01-25 21:10:36 +02:00
ingo@mysql.com
704d84a12c
Merge mysql.com:/home/mydev/mysql-5.0
...
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-25 19:37:15 +01:00
jani@ua141d10.elisa.omakaista.fi
4341ffda0e
Some minor fixes.
2005-01-25 20:08:16 +02:00
jani@ua141d10.elisa.omakaista.fi
d77dc4f6a4
Merge
2005-01-25 18:35:11 +02:00
jani@ua141d10.elisa.omakaista.fi
d5f76d50f6
Some bug fixes and a feature add to mysql-test-run
2005-01-25 18:32:09 +02:00
mskold@mysql.com
1ba93bd46e
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-01-25 17:03:28 +01:00
tomas@poseidon.ndb.mysql.com
df8353d5d1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 16:37:18 +01:00
joreland@mysql.com
ed32be8afc
merge
2005-01-25 16:11:47 +01:00
joreland@mysql.com
fa4f07b81d
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-25 15:57:08 +01:00
joreland@mysql.com
5e1bea84c8
ndb - Move mysql-test-run & testBackup into "basic suite"
2005-01-25 15:56:20 +01:00
konstantin@mysql.com
6c3a4aee18
Fix two typos in comments.
2005-01-25 17:25:46 +03:00
mskold@mysql.com
da658b9f11
Fix for failing INSERT IGNORE in test ndb_insert
2005-01-25 15:08:51 +01:00
jani@ua141d10.elisa.omakaista.fi
8a5316a425
Merge 4.1 -> 5.0
2005-01-25 15:24:04 +02:00
marko@hundin.mysql.fi
72de651ab5
One more after merge fix of Jan Lindström's changeset in 4.1
2005-01-25 14:49:30 +02:00
tomas@poseidon.ndb.mysql.com
d8fe3d01af
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 13:48:12 +01:00
tomas@poseidon.ndb.mysql.com
b4eebbc0b6
changed from using column names to column id in ndb setBound in ha_ndbcluster
2005-01-25 13:46:40 +01:00
marko@hundin.mysql.fi
7eaec7eff7
After merge fixes
2005-01-25 14:44:34 +02:00
bar@mysql.com
d4a52f5f12
Makefile.am:
...
after merge fix
2005-01-25 16:29:24 +04:00
marko@hundin.mysql.fi
ee22415528
Merge hundin.mysql.fi:/home/marko/k/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2005-01-25 14:17:51 +02:00
marko@hundin.mysql.fi
ea1bd1d5e5
InnoDB: Enable ut_ad() assertions in MySQL debug builds.
2005-01-25 14:16:41 +02:00
monty@mysql.com
36c8977dc6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/my/mysql-4.1
2005-01-25 14:02:09 +02:00
monty@mysql.com
ef448b7fb1
Add flags for Intel 64 bit
2005-01-25 14:00:35 +02:00
marko@hundin.mysql.fi
a698e5a0e1
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2005-01-25 12:13:34 +02:00
marko@hundin.mysql.fi
fbb7d9a9df
InnoDB: Write status bits to MLOG_COMP_REC_INSERT entries.
...
It is not safe to infer the status bits from the B-tree page
level, because after MLOG_COMP_LIST_END_COPY_CREATED, the
level will not be initialized before the records have been inserted.
(Bug #7973 )
2005-01-25 12:10:24 +02:00
ram@gw.mysql.r18.ru
bb1fe73356
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-25 13:39:19 +04:00