tomas@poseidon.ndb.mysql.com
a4843c63e3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-01 22:51:24 +01:00
kent@mysql.com
bb806c1e98
make_win_src_distribution.sh, make_binary_distribution.sh, mysql-test-run.sh:
...
Removed references to ISAM and MERGE
2005-01-01 21:13:09 +01:00
kent@mysql.com
4c914f1c15
Many files:
...
Removed references to ISAM and MERGE
2005-01-01 20:54:45 +01:00
kent@mysql.com
fb820c4b9c
prepare, winmysqladmin.cpp, mysqldmax.dsp, mysqld.dsp, mysql.dsw:
...
Removed references to ISAM and MERGE
2005-01-01 20:27:51 +01:00
joreland@mysql.com
9dac644fc9
ndb - removed deprecated Ndb constructor
2005-01-01 19:25:31 +01:00
joreland@mysql.com
228a63d337
ndb - post merge fixes
2005-01-01 17:57:50 +01:00
joreland@mysql.com
fe8f4ab012
merge
2005-01-01 14:01:37 +01:00
joreland@mysql.com
0de1b0f213
ndb - more removal of old constructor usage in test prgs
2005-01-01 09:28:24 +01:00
joreland@mysql.com
a7c2a9e0b8
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-01-01 09:13:17 +01:00
serg@sergbook.mysql.com
a5ccba28ea
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0
2004-12-31 18:01:00 +01:00
serg@sergbook.mysql.com
a9c7fb9dfd
post-merge
2004-12-31 17:59:43 +01:00
serg@sergbook.mysql.com
a04fc26c54
manually merged
2004-12-31 15:26:24 +01:00
heikki@hundin.mysql.fi
e97584fbb4
row0upd.c:
...
Manually merge the little InnoDB bug fix from 4.1 to 5.0; Marko can then run tests on the fixed version
2004-12-31 15:14:17 +02:00
sergefp@mysql.com
98ccc21011
Make test results independent on who runs them
2004-12-31 15:48:19 +03:00
sergefp@mysql.com
849d1203ff
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0-debug-31dec
2004-12-31 15:13:48 +03:00
sergefp@mysql.com
b572374c0b
Remove display of join buffer size, test fails when someone changes the minimum
2004-12-31 15:11:07 +03:00
sergefp@mysql.com
91ab26eaf1
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
2004-12-31 14:55:34 +03:00
sergefp@mysql.com
034c59ed59
Fix test results to account for difference between release BDB, debug BDB and MyISAM.
2004-12-31 14:48:11 +03:00
dlenev@brandersnatch.localdomain
4e17aab243
Yet another after merge fix.
...
Now max_user_connections is 36th field in mysql.user table
(two new SP-related privileges were added).
2004-12-31 14:02:40 +03:00
serg@sergbook.mysql.com
45ce994e5d
post-merge
2004-12-31 11:52:14 +01:00
joreland@mysql.com
3c52b247ac
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 11:39:43 +01:00
dlenev@mysql.com
2f8dcec05a
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/dlenev/src/mysql-5.0-1339
2004-12-31 13:33:00 +03:00
sergefp@mysql.com
a09df7488d
Merge mysql.com:/dbdata/psergey/mysql-5.0-bug7264
...
into mysql.com:/dbdata/psergey/mysql-5.0-build-fix-31dec
2004-12-31 13:15:54 +03:00
monty@mysql.com
08416134c1
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2004-12-31 12:01:55 +02:00
monty@mysql.com
e4ffff2918
Fix max_key_length and max_unique_length to take into account varchar and null extra lengths
...
This fixes a bug found by bdb.test
Fixes a portability issue with bdb tables
2004-12-31 11:56:50 +02:00
dlenev@mysql.com
536cb92195
Manual merge.
2004-12-31 12:48:27 +03:00
mronstrom@mysql.com
2745a69418
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/mikron/mysql-5.0
2004-12-31 10:39:24 +01:00
joreland@mysql.com
4a26906bd6
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 10:22:05 +01:00
joreland@mysql.com
e4197f2e4f
merge
2004-12-31 10:21:33 +01:00
joreland@mysql.com
7f6fb4d9de
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-31 10:07:49 +01:00
joreland@mysql.com
7b7113a9bf
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-31 09:51:57 +01:00
joreland@mysql.com
e9c5ad80b2
merge
2004-12-31 09:51:28 +01:00
vtkachenko@intelp4d.mysql.com
ae1b969c8f
Merge bk-internal:/home/bk/mysql-5.0
...
into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
2004-12-31 09:00:34 +01:00
joreland@mysql.com
8f2d0ec1a1
merge
2004-12-31 06:36:32 +01:00
joreland@mysql.com
dd32940b50
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-31 06:14:18 +01:00
monty@mysql.com
8f7a2bbaee
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-merge
2004-12-31 03:48:47 +02:00
monty@mysql.com
5e03ebbcad
After merge fixes
...
Cleanup of mi_print_error() handling
Deleted 'merge' directory
2004-12-31 03:47:56 +02:00
mronstrom@mysql.com
91f15dc67b
Bug #7593
...
Caused a hard limit of 64 unique indexes in cluster
2004-12-31 02:22:48 +01:00
marko@hundin.mysql.fi
526b996a36
page0page.c:
...
page_dir_find_owner_slot(): Fix bug in corruption diagnostics.
2004-12-31 00:56:54 +02:00
monty@mysql.com
34d5331cee
Merge with global tree
2004-12-31 00:50:30 +02:00
marko@hundin.mysql.fi
b9fdd87624
row0upd.c:
...
row_upd_clust_rec(): Call btr_cur_get_rec() after
btr_pcur_restore_position(), not before. (Bug #7598 )
2004-12-31 00:46:33 +02:00
monty@mysql.com
d71c030587
After merge fixes
2004-12-31 00:44:00 +02:00
tulin@build.mysql.com
598ae38fa8
NdbDictionary.hpp:
...
updated ndb dictionary docs
2004-12-30 23:38:21 +01:00
serg@sergbook.mysql.com
c7e756f959
merged
2004-12-30 21:11:40 +01:00
serg@sergbook.mysql.com
12bf7dcd04
unsufficient privilege checks in GRANT, when a grantor has column-level privileges
2004-12-30 21:01:11 +01:00
marty@linux.site
1ddb554b8b
Fix for bug #7480 Mysqld crash in ha_ndbcluster using Query Browser
2004-12-30 19:56:09 +01:00
marko@hundin.mysql.fi
4dbd101c57
Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2004-12-30 19:14:38 +02:00
marko@hundin.mysql.fi
3653b08986
InnoDB: Remove crash in in-place update from NULL to non-NULL. (Bug #7591 )
...
rem0rec.c:
rec_init_offsets(): Make the function comment more accurate.
rem0rec.ic:
rec_get_nth_field(): Return pointer to the field, even to NULL fields.
rec_set_nth_field(): Make more accurate debug assertions.
2004-12-30 19:13:31 +02:00
petr@mysql.com
b1387f5dde
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-30 19:25:51 +03:00
petr@mysql.com
0359879624
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-30 19:21:10 +03:00
