Commit graph

19897 commits

Author SHA1 Message Date
lenz@mysql.com
a0089319d2 - make sure to include the embedded test results in the source distribution 2005-02-09 17:49:43 +01:00
lenz@mysql.com
8999d5ab11 - added copyright header on top of the fill_help_tables.sql file (BUG#5772)
- updated mysql-copyright-2 to properly convert this new header from GPL to commercial for the
  commercial distribution
2005-02-09 17:40:10 +01:00
kent@mysql.com
9a564f832a Merge 2005-02-09 16:56:58 +01:00
msvensson@neptunus.homeip.net
b8490b5524 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-09 16:26:06 +01:00
msvensson@neptunus.homeip.net
0ed971878d Fix so that master and master1 does not write to same .trace file 2005-02-09 16:23:22 +01:00
tomas@poseidon.ndb.mysql.com
374076b481 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-09 15:38:31 +01:00
tomas@poseidon.ndb.mysql.com
91a593adcb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-09 15:36:57 +01:00
matthias@three.local.lan
83b1d82add Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 15:33:01 +01:00
wax@mysql.com
00cc3cbfed Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/wax/mysql/mysql-5.0
2005-02-09 19:20:53 +05:00
tomas@poseidon.ndb.mysql.com
75cc37a13c use EXTRA_DIST instead of noinst_HEADERS 2005-02-09 15:20:38 +01:00
serg@serg.mylan
3e708a27b1 Merge 2005-02-09 15:16:47 +01:00
serg@serg.mylan
184410c475 gone:
merged
  auto-union
2005-02-09 15:16:14 +01:00
wax@mysql.com
bc9e89a85d Merge mysql.com:/home/wax/mysql/mysql-5.0
into mysql.com:/home/wax/mysql/mysql-5.0test
2005-02-09 19:16:00 +05:00
wax@kishkin.ru
a0507f98b9 merge 2005-02-09 19:13:20 +05:00
msvensson@neptunus.homeip.net
e64145818b Fix core dump in ha_ndbcluster::print_results 2005-02-09 15:09:13 +01:00
mskold@bk-internal.mysql.com
14e3d36ad4 Removed old files 2005-02-09 14:35:50 +01:00
joreland@mysql.com
5b251f5e03 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-02-09 14:25:29 +01:00
joreland@mysql.com
9b77596587 ndb -
Fix bug in bug fix in FastScheduler
  remove possibility of endless loop
  resulting in APZJobBuffer overflow due to statistics reporting
2005-02-09 14:24:25 +01:00
serg@serg.mylan
78cf24fb8c clean up gone 2005-02-09 14:05:01 +01:00
tomas@poseidon.ndb.mysql.com
fe1ad21bda Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-09 13:57:30 +01:00
serg@serg.mylan
902e78ffb0 Merge serg.mylan:/usr/home/serg/Abk/m50-broken
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-02-09 13:48:31 +01:00
tomas@poseidon.ndb.mysql.com
d8f7573f30 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-09 13:36:27 +01:00
hf@deer.(none)
dca227bac6 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 16:34:03 +04:00
hf@deer.(none)
2f7f2dfe5d Fix for NCHAR bug appeared during the merging 2005-02-09 16:32:43 +04:00
msvensson@neptunus.homeip.net
a995633ab7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
2005-02-09 11:16:50 +01:00
msvensson@neptunus.homeip.net
facc7b4da1 Updated style after review 2005-02-09 11:14:02 +01:00
mleich@mysql.com
48bc6d477d Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-09 11:00:15 +01:00
bell@sanja.is.com.ua
7df94d5e9b fixed C++ syntax in C code
fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)
ignore my_decimal.cc in libmysqld directory
2005-02-09 11:35:22 +02:00
hf@deer.(none)
96558f6ad3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
2005-02-09 02:54:08 +04:00
hf@deer.(none)
b94a482ee9 Precision Math implementation 2005-02-09 02:50:45 +04:00
sergefp@mysql.com
dcc65b77a6 Fix for BUG#8371: wrong rec_per_key value for hash index on temporary table 2005-02-08 23:44:51 +03:00
pem@mysql.comhem.se
2c26ebe359 WL#2130: Table locking for stored FUNCTIONs
Collect all tables and SPs refered by a statement, and open all tables
with an implicit LOCK TABLES. Do find things refered by triggers and views,
we open them first (and then repeat this until nothing new is found), before
doing the actual lock tables.
2005-02-08 20:52:50 +01:00
jani@ua141d10.elisa.omakaista.fi
1c2f4ffecb Applied a patch for Netware. 2005-02-08 19:49:40 +02:00
kent@mysql.com
e27f92103e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-02-08 18:14:26 +01:00
tomas@poseidon.ndb.mysql.com
73b49dcf91 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-08 17:27:00 +01:00
tomas@poseidon.ndb.mysql.com
d22acbb732 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-02-08 17:25:34 +01:00
tomas@poseidon.ndb.mysql.com
1ec29ede51 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-08 17:23:48 +01:00
tomas@poseidon.ndb.mysql.com
153e85afe7 Makefile.am:
added noinst_HEADERS to get all things for the src dist
2005-02-08 17:22:26 +01:00
mleich@mysql.com
f227e270de Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-02-08 15:59:37 +01:00
marko@hundin.mysql.fi
e7c10dd2d8 InnoDB: Fix Bug #7350 without hard-coding charset-collation numbers. 2005-02-08 16:41:34 +02:00
wax@mysql.com
7d1af16c2a Merge mysql.com:/home/wax/mysql/mysql-4.1
into mysql.com:/home/wax/mysql/mysql-4.1test2
2005-02-08 18:51:42 +05:00
kent@mysql.com
f2b3a33551 Merge 2005-02-08 13:59:29 +01:00
jan@hundin.mysql.fi
bd50066cfe Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-02-08 14:51:05 +02:00
jan@hundin.mysql.fi
6e6daf8189 Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-02-08 14:48:25 +02:00
mleich@mysql.com
c1c4822bf3 Insertion of additional sub test cases checking DATA/TIME/TIMESTAMP
functionality into the test case "strict".

The additional sub test cases are part of the SoW6 test draft
(sow6-dates.test) written by Trudy/PeterG. 

sow6-dates will be no longer needed, because "strict" contains with
this extension all sub test cases of sow6-dates.
2005-02-08 13:46:04 +01:00
monty@mysql.com
79ec81071a Better bugfix for "HAVING when refering to RAND()" (Bug #8216)
Ensure that references in HAVING, ORDER BY or GROUP BY are calculated after fields in SELECT.
This will ensure that any reference to these has a valid value.
Generalized the code for split_sum_func()
2005-02-08 14:41:09 +02:00
marko@hundin.mysql.fi
7dbb93d9fc InnoDB: Make SHOW TABLE STATUS report Row_format=Compact and
Row_format=Redundant
2005-02-08 13:35:10 +02:00
pekka@mysql.com
22c1836728 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/orca/space/pekka/ndb/version/my50
2005-02-08 11:12:55 +01:00
tomas@poseidon.ndb.mysql.com
6c9cf886dd Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-02-08 11:12:54 +01:00
pekka@mysql.com
f6dff046e4 ndb - workaround to strnxfrm 5.0 problem 2005-02-08 10:33:58 +01:00