serg@sergbook.mysql.com
a04fc26c54
manually merged
2004-12-31 15:26:24 +01: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
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
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
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
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
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
georg@beethoven.site
448d453ac1
Merge from 4.1: fix for bug #7285 (embedded server)
2004-12-30 17:17:21 +01:00
gluh@gluh.mysql.r18.ru
551456b30c
Removed unnecessary chahges from previous commit(see ChangeSet 1.1761 04/12/30)
2004-12-30 19:16:44 +03:00
gluh@gluh.mysql.r18.ru
50266af38c
wl#1629 SHOW with WHERE(final part, after review)
...
added syntax:
'show variables where', 'show status where', 'show open tables where'
2004-12-30 15:20:40 +03:00
sergefp@mysql.com
38b9f73347
Fix for BUG#7264: Change the test so optimizer doesn't have to make choice between two with [nearly] identical
...
costs.
2004-12-30 14:40:24 +03:00
marko@hundin.mysql.fi
043c1d3280
InnoDB: fix bug in insert buffer merge of prefix columns in
...
new-style InnoDB tables. (Bug #7578 )
2004-12-29 23:22:25 +02:00
dlenev@brandersnatch.localdomain
e35694802b
WL#1339. More post-merge fixes.
...
Updated test results after adding max_user_connections column
to mysql.user table.
2004-12-29 23:39:44 +03:00
dlenev@mysql.com
a8deefa3dd
Manual merge of patch implementing WL#1339 with main tree.
2004-12-29 22:35:16 +03:00
dlenev@brandersnatch.localdomain
ffa7393330
WL#1339 "Add per account max_user_connections limit (maximum number
...
of concurrent connections for the same account)"
Added support of account specific max_user_connections limit. Made all
user limits to be counted per account instead of the old behavior,
which was per user/host accounting. Added option which enables the old
behavior. Added testing of these to the test suite.
(After review version).
2004-12-29 20:30:37 +03:00
heikki@hundin.mysql.fi
2aa98f89aa
srv0start.c:
...
Print a more descriptive error and refuse to start InnoDB if the size of ibdata files is smaller than what is stored in the tablespace header; innodb_force_recovery will override this
2004-12-29 17:06:26 +02:00
marko@hundin.mysql.fi
7adeebd9a1
InnoDB: Remove dependency on rem0rec.ic from dict0dict.ic (Bug #7464 )
2004-12-29 12:09:23 +02:00
petr@mysql.com
1e24a49d45
VC++Files/mysqlmanager deleted
2004-12-29 11:41:58 +03:00
petr@mysql.com
d70f5c1c58
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2004-12-29 01:12:09 +03:00
petr@mysql.com
fdb3b0b6c1
cleanup
2004-12-29 00:13:32 +03:00
lenz@mysql.com
e8e6d0577f
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-12-28 17:38:30 +01:00
serg@serg.mylan
cf6e2214d8
client/mysqldump.c
...
compilation failure fixed
cleanup
2004-12-28 17:33:49 +01:00
pem@mysql.comhem.se
b17326a3d6
Reverted previous name changes of all bug tests in sp.test, but kept the
...
robustness (dropping things just in case).
2004-12-28 16:58:14 +01:00
joreland@mysql.com
b5bc298018
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2004-12-28 13:54:49 +01:00
timour@mysql.com
1613bf2731
Merge mysql.com:/home/timka/mysql/src/4.1-virgin
...
into mysql.com:/home/timka/mysql/src/4.1-dbg
2004-12-28 13:22:39 +02:00
timour@mysql.com
064c73490b
Fix for BUG#7455.
...
The fix checks if the trim string argument is NULL. If so, the standard
mandates that the function result must be also NULL.
2004-12-28 11:57:56 +02:00
lenz@mysql.com
878ed021e9
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2004-12-28 10:08:37 +01:00