pekka@mysql.com
425553e066
add myself to checkout:get (should be default for all)
2006-01-25 22:49:31 +01:00
monty@mysql.com
a6f5375cb0
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
guilhem@mysql.com
4252b546b3
Merge mysql.com:/home/mysql_src/mysql-4.1
...
into mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset
2005-10-12 21:58:02 +02:00
guilhem@mysql.com
e6043231ea
Importing BUILD/compile-pentium64-valgrind-max from 5.0 (unchanged), and speeding up 'bk citool' for me
2005-10-04 22:24:04 +02:00
ndbdev@dl145b.mysql.com
46cc62e216
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-09-09 15:26:47 +02:00
aivanov@mysql.com
2165167200
Merge mysql.com:/home/alexi/dev/mysql-4.1-0
...
into mysql.com:/home/alexi/dev/mysql-5.0-0
2005-09-06 23:49:54 +04:00
lenz@mysql.com
ec61094daf
- removed the commercial BK license key from BitKeeper/etc/config to be able to push the
...
repository to bkbits.net (License keys should not be put into the repository!)
2005-09-05 09:41:18 +02:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
tomas@poseidon.ndb.mysql.com
0c859d6651
config:
...
updated tomas default checkout
2005-08-25 13:15:29 +02:00
tomas@poseidon.ndb.mysql.com
90778fc857
config:
...
changed tomas default checkout
2005-08-25 13:04:53 +02:00
jonas@eel.(none)
e449bfed9d
jonas:
...
fix bk checkout properties
2005-08-19 10:24:37 +02:00
jonas@eel.(none)
24be1c1524
jonas -
...
Fix checkout properties
2005-08-19 09:04:30 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
8f10662eab
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2005-07-23 00:15:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2657e48c64
Faster alter table code for 5.1.
2005-07-22 23:43:59 +03:00
tomas@poseidon.ndb.mysql.com
9743190cd9
no open logging
...
adopted perl test script for new dir structure
2005-07-12 13:51:25 +02:00
lenz@mysql.com
36ddf47bed
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0-build
2005-07-06 08:50:22 +02:00
lenz@mysql.com
ddca379b87
Merge mysql.com:/space/my/mysql-4.0-build
...
into mysql.com:/space/my/mysql-4.1-build
2005-07-05 19:53:35 +02:00
lenz@mysql.com
eaac485b17
- disabled openlogging to satisfy BK when using a commercial license key
2005-07-05 17:09:56 +02:00
marty@flipper.bredbandsbolaget.se
eb729f9a29
Merge flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.0
...
into flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.1
2005-06-23 10:58:37 +02:00
ndbdev@dl145b.mysql.com
be1177c15b
merge
2005-06-14 00:05:27 +02:00
tulin@dl145c.mysql.com
e08993f069
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
2005-06-13 20:40:53 +02:00
tulin@dl145c.mysql.com
57ddf5223f
logging_ok:
...
Logging to logging@openlogging.org accepted
DbtcMain.cpp, testTimeout.cpp:
Bug #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
2005-06-13 19:45:15 +02:00
igor@igor-inspiron.creware.com
750fca61f9
ctype_utf8.test, ctype_utf8.result:
...
Added a test case for bug #11167 .
sql_select.cc:
Fixed bug #11167 .
In 4.1 char/varchar fields are limited by 255 characters in
length that make them longer than 255 bytes in size for such
character sets as UTF8. The functions store_record_in_cache
and read_cached_records did not take into account this
Moreover the code did not take into account that the size
of the varchar fields in 5.0 can be up to 65535 bytes
2005-06-13 06:10:19 -07:00
joreland@mysql.com
84a04b4a9d
merge
2005-06-13 14:09:09 +02:00
joreland@mysql.com
54cff2bc30
merge
2005-06-13 08:05:29 +02:00
obarnir@mysql.com
156d351e1d
Adding auxiliary scripts that allow to display messages in result files from within test files
...
- show_msg.inc - displays a message followed by a line of '-' at the length of the messgae
- show_msg80.inc - displays a message followed by a line of '-' with a fixed length of 80
2005-06-09 11:01:23 -07:00
igor@rurik.mysql.com
c963b12fd3
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-07 06:38:05 -07:00
elliot@mysql.com
2a1f5c0748
Accepted openlogging
2005-06-07 05:10:18 -04:00
mronstrom@mysql.com
6a376bec64
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/Users/mikron/bug10901
2005-06-06 10:42:11 +02:00
tomas@poseidon.ndb.mysql.com
f6d51a44f4
Merge
2005-06-04 19:26:35 +02:00
mronstrom@mysql.com
96252c1de9
Bug #10901
...
Analyze table corrupts the state on
data_file_length, records, index_file_length...
by writing the shared state when there is an updated internal
state due to inserts or deletes
Fixed by synching the shared state with the internal state before
writing it to disk
Added test cases of 2 error cases and a normal case in new
analyze test case
2005-06-03 17:13:43 +02:00
ndbdev@dl145b.mysql.com
25cb14234a
sql_repl.cc:
...
Bug #11064 some read error not detected in replication on 64-bit platform
2005-06-03 11:16:37 +02:00
reggie@monster.
0e139b8908
Merge monster.:D:/Work/mysql-4.1 into monster.:D:/Work/mysql5.0
2005-06-02 12:36:55 -05:00
reggie@monster.
7b9d4eaa92
fixed compile problem by replacing W_OK with F_OK
2005-06-02 11:12:58 -05:00
igor@igor-inspiron.creware.com
186e8c5891
item_func.h:
...
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
The str_op virtual method was added into Item_func_numhybrid.
item_func.cc:
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
The str_op virtual method was added into Item_func_numhybrid.
item_cmpfunc.h, item_cmpfunc.cc:
Fixed bug #9939 : a wrong conversion of arguments
for functions COALESCE and IFNULL.
Item_func_coalesce and Item_func_ifnull now
inherit from a modified Item_func_numhybrid.
case.test, case.result:
Added test cases for bug #9939 .
2005-06-02 07:27:02 -07:00
tomas@poseidon.ndb.mysql.com
1eae382f9d
2005-05-31 19:59:57 +02:00
tomas@poseidon.ndb.mysql.com
7b2ad0beca
.del-reserved_win_names-master.opt~e56da049a7ce9a5b:
...
Delete: mysql-test/t/reserved_win_names-master.opt
2005-05-31 17:51:45 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09
Merge
2005-05-31 14:37:47 +02:00
patg@radha.local
a6af23a046
changes to fix joins not working (bug #10848 ). New tests, as well as table->status being set in index_read_idx
2005-05-25 02:15:09 +02:00
gbichot@bk-internal.mysql.com
a49ccfe6f0
Merge bk-internal.mysql.com:/data0/bk/mysql-4.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0
2005-05-24 00:31:28 +02:00
gbichot@bk-internal.mysql.com
76a20eb397
marking the file gone again to hopefully get the tree on its feet
2005-05-23 23:54:39 +02:00
tulin@dl145c.mysql.com
03590c20bd
merge
2005-05-18 22:26:23 +02:00
jimw@mysql.com
3f6aad900c
Resolve merge from 4.1
2005-05-18 11:06:34 -07:00
schwenke@lmy003.wdf.sap.corp
badfc2e4a9
new build scripts for SAP team
2005-05-18 15:28:51 +02:00
tulin@dl145c.mysql.com
13bbb3dbb3
ndberror.c:
...
updated error message for ndb
2005-05-18 10:22:27 +02:00
tulin@dl145c.mysql.com
23f79bd1f2
merge
2005-05-17 10:17:53 +02:00
tulin@dl145c.mysql.com
9a6cc9172a
removed include of bitvector.h
...
result fix Tables_in_information_schema -> Tables_in_INFORMATION_SCHEMA
2005-05-16 13:41:34 +02:00
bell@book.sanja.is.com.ua
1ff9f55920
relaxed DBUG_ASSERT in Item_int_with_ref::new_item() to "any constant" (BUG#10020)
2005-05-16 12:19:10 +03:00
serg@serg.mylan
40ce1e174d
merged
2005-05-14 19:28:29 +02:00
konstantin@mysql.com
e5c916f7e8
Merge
2005-05-13 13:26:08 +02:00