joreland@mysql.com
ee75c45d9d
fix updated signature
2004-09-20 20:50:48 +02:00
magnus@neptunus.(none)
165bf1d955
Merge msvensson@build.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql/mysql-4.1
2004-09-20 14:04:13 +02:00
mleich@mysql.com
933b9fff3e
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/GORDON/MySQL/mysql-4.1/src
2004-09-20 13:23:35 +02:00
mleich@mysql.com
51d42739b9
These modifications were part of WL#1856 Conversion of client_test.c tests cases to mysqltest if possible
...
They are separated from the other WL#1856 stuff, because they improve the behaviour of the current tests.
Make the result sets (order of rows) more predictable by using ORDER BY.
2004-09-20 13:10:47 +02:00
magnus@neptunus.(none)
9aab724d6c
Ues buf pointer in get_ndb_value
...
Merge fixes
2004-09-20 12:40:53 +02:00
joreland@mysql.com
8629e41d6f
bug#5659
...
uninit variable
2004-09-20 12:21:08 +02:00
joreland@mysql.com
511820cb2e
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2004-09-20 11:53:44 +02:00
magnus@neptunus.(none)
47168d1219
Merged new ndb_insert.test and .result
2004-09-20 11:14:31 +02:00
magnus@neptunus.(none)
94693e7799
Merge msvensson@build.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql/mysql-4.1
2004-09-20 10:48:20 +02:00
konstantin@mysql.com
4230eae857
A fix and test case for bug#5510 "inserting Null in AutoIncrement primary
...
key Column Fails".
2004-09-18 01:10:09 +04:00
igor@rurik.mysql.com
c12c9af224
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-09-16 13:53:22 -07:00
konstantin@mysql.com
2fd2846f55
A quick fix for bug#5556: replace a column of SHOW TABLE STATUS result
...
with a fixed constant to pass on QNX:
max_data_file_length is calculated depending on max possible value of
record pointer. It's different on QNX, so the difference in results is OK.
2004-09-16 22:13:24 +04:00
marko@hundin.mysql.fi
a660499cd9
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/j/mysql-4.1
2004-09-16 19:09:38 +03:00
bell@sanja.is.com.ua
b1374836b3
wording fixed
2004-09-16 18:37:26 +03:00
bell@sanja.is.com.ua
97a1418d16
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-update-4.1
2004-09-16 17:47:53 +03:00
bell@sanja.is.com.ua
f6dba131eb
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-sum-4.1
2004-09-16 16:24:46 +03:00
jani@rhols221.adsl.netsonic.fi
ac55486644
A fix for MetroWerks compiler.
2004-09-16 16:24:45 +03:00
jani@rhols221.adsl.netsonic.fi
dd5d2d8a6d
Applied a few Netware patches.
2004-09-16 16:24:44 +03:00
ram@gw.mysql.r18.ru
a5d6f9f79a
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-09-16 18:24:43 +05:00
tomas@poseidon.(none)
5ee0411275
compile fix
2004-09-16 13:24:42 +00:00
ram@gw.mysql.r18.ru
dda34d21b9
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2004-09-16 15:05:17 +05:00
ram@gw.mysql.r18.ru
80f6c7e9a9
Clean-up. The length of compress() may depend on zlib version, etc.
2004-09-16 15:01:12 +05:00
bar@mysql.com
7c4ab566d2
Return character strings in table, type, possible_keys, key fields
...
of EXPLAIN SELECT, rather than binary strings.
2004-09-16 14:47:39 +05:00
igor@rurik.mysql.com
c9265171dc
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2004-09-16 01:23:38 -07:00
tomas@poseidon.(none)
9df9132183
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
2004-09-16 08:23:37 +00:00
tomas@poseidon.(none)
5488f207db
mysql_install_db should do skip-ndbcluster
...
set a printout in SocketClient only for debug
2004-09-16 08:22:22 +00:00
magnus@neptunus.(none)
713c80d2b3
Add variable to printout
2004-09-16 09:51:35 +02:00
magnus@neptunus.(none)
f53bf1b6de
Added DBUG_PRINT
2004-09-16 09:40:59 +02:00
igor@rurik.mysql.com
cfbd2b7f7a
opt_sum.cc:
...
Slightly improved the fix for bug #5406 .
2004-09-15 23:52:46 -07:00
bar@mysql.com
e39a5033f2
item.cc:
...
Bug #5561 No BINARY_FLAG in metadata
2004-09-16 11:12:49 +05:00
mskold@mysql.com
251fe25bf8
Optimzed handling of NO_AUTO_VALUE_ON_ZERO
2004-09-16 04:55:22 +02:00
mskold@mysql.com
9cf8385540
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-09-15 19:01:00 +02:00
mskold@mysql.com
81d5944f25
Fixed compiler warnings
2004-09-15 19:00:23 +02:00
magnus@neptunus.(none)
d063c87d50
Merge msvensson@build.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql/mysql-4.1
2004-09-15 18:59:27 +02:00
vva@eagle.mysql.r18.ru
7638dbc562
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2004-09-15 21:59:26 +05:00
vva@eagle.mysql.r18.ru
a8cc9250a9
fixed Bug #5589 "libedit compile failure in term.c"
...
(for octane2)
included term.h if there isn't termcap.h in cmd-line-utils/libedit/term.c
2004-09-15 21:50:32 +05:00
mskold@mysql.com
4a9805679e
Fixed handling of NO_AUTO_VALUE_ON_ZERO
2004-09-15 18:44:18 +02:00
mskold@mysql.com
089e0565d1
Added support for auto_increment of partial key
2004-09-15 17:31:15 +02:00
magnus@neptunus.(none)
3309542dfe
Merge msvensson@build.mysql.com:/home/bk/mysql-4.1
...
into neptunus.(none):/home/magnus/mysql/mysql-4.1
2004-09-15 16:01:58 +02:00
magnus@neptunus.(none)
76fd06c704
Print the error message if read of local config fails.
2004-09-15 16:01:20 +02:00
joreland@mysql.com
27a4e6e29e
drop table after test (if created & success)
2004-09-15 15:57:12 +02:00
joreland@mysql.com
8870f53e33
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-15 15:32:49 +02:00
joreland@mysql.com
a01963dfad
New test prg, testLcp
2004-09-15 15:17:16 +02:00
joreland@mysql.com
770c8ecfdd
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1-ndb
2004-09-15 15:12:51 +02:00
magnus@neptunus.(none)
013486701c
BUG#4775 "Duplicate key requires rollback of transaction" - Improved error message telling that transaction is aborted
...
BUG#4312 "wrong behaviour on insert .. on duplicate key" functionality disabled
2004-09-15 14:44:21 +02:00
tomas@poseidon.(none)
9201b78b5f
fixed bug in bank
2004-09-15 10:46:20 +00:00
konstantin@mysql.com
452b62b81a
Fix the test case to make it more predictable (cause: 4.1.5 test failure
...
on intelxeon3 (Solaris x86))
2004-09-15 14:25:58 +04:00
ram@gw.mysql.r18.ru
b3dc9f65b0
A fix (bug #5540 : CONCAT function and 'double' type).
2004-09-15 15:13:17 +05:00
ram@gw.mysql.r18.ru
1dd895d4e1
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5546
2004-09-15 14:00:52 +05:00
bar@mysql.com
0f39138756
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-4.1
2004-09-15 13:45:44 +05:00