Commit graph

19269 commits

Author SHA1 Message Date
mleich@mysql.com
0e442f7c45 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src
2005-01-26 14:40:49 +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
monty@mysql.com
a0175a9a6b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-01-26 15:33:02 +02:00
ram@gw.mysql.r18.ru
7f6fca4cf0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2005-01-26 17:09:38 +04:00
ram@gw.mysql.r18.ru
0c4e1e716e 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-26 16:54:22 +04: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
mleich@mysql.com
0191a35ab5 Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-01-26 13:24:00 +01: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 : help.test fails using --ps-protocol) 2005-01-26 16:02:19 +04:00
matthias@three.local.lan
5ecd4d1d14 Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-01-26 12:15:41 +01:00
ram@gw.mysql.r18.ru
f995a526b1 a fix (bug : help.test fails using --ps-protocol) 2005-01-26 15:11:55 +04:00
monty@mysql.com
fae08a34f2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2005-01-26 12:56:13 +02:00
monty@mysql.com
33878ac87a Added -DDBUG_ON to CXXFLAGS when compiling with debugging
This fixes a memory allocation bug in Innobase as structs was defined differently in .c and .cc files
2005-01-26 12:55:35 +02: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
mleich@mysql.com
60b64b7077 WL#1420 convert NIST test for mysql
Test cases using common object (database,user,table,..) names could probably
  destroy customer data, when connecting to an already running server.
  
  This Changeset contains an auxiliary routine  include/testdb_only.inc" which
  should be sourced by tests doing such dangerous things. 
  The test case will get a "[skipped]" when the environment variable 
  USE_RUNNING_SERVER is not 0 .
  The modified mysql-test-run.sh sets USE_RUNNING_SERVER to 0, when 
  the "mysql-test-run" starts its own server, aka there was no "--extern"
  option.
2005-01-26 10:19:28 +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
ram@gw.mysql.r18.ru
f353bad256 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-26 12:37:25 +04:00
dlenev@mysql.com
560f2bd4d6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
2005-01-26 11:23:14 +03: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
ingo@mysql.com
5ea224b824 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-26 09:09:53 +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
igor@rurik.mysql.com
7d34849e6e order_by.result, order_by.test:
Added test case for bug  that existed only in 4.0.
2005-01-25 23:13:36 -08:00
patg@patrick-galbraiths-computer.local
470aed3aaf Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-25 19:03:30 -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
patg@patrick-galbraiths-computer.local
e0cd200891 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-25 11:10:07 -08: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
patg@patrick-galbraiths-computer.local
1bceba0995 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-25 09:35:57 -08: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