Commit graph

18218 commits

Author SHA1 Message Date
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
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
joreland@mysql.com
91a04d182b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-30 11:55:50 +01:00
joreland@mysql.com
5de6bf24ae ndb testcases - more removal of old constructor 2004-12-30 11:55:08 +01:00
stewart@mysql.com
d737ba981e Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl2
2004-12-30 11:59:23 +11:00
stewart@mysql.com
b42337bb68 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
2004-12-30 11:56:55 +11: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
joreland@mysql.com
dc0a3f655e ndb - more old constructors 2004-12-29 16:27:27 +01:00
joreland@mysql.com
46c153509c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-29 16:13:06 +01: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
joreland@mysql.com
3c4c866f9f ndb - Update test programs to use new Ndb constructor 2004-12-29 16:01:43 +01:00
jon@gigan.
f2596861c3 Got rid of <code> tags in doxygen comments for mgmapi.h
and ndbapi.hpp as they look like crap when converted 
to PDF.
2004-12-30 00:44:59 +10:00
jon@gigan.
1ca06912a1 Setting doxygen configs to:
align class members = no (get rid of crufty HTML 
tables that don't translate well into PDF)
tab = 2 (8 is too wide)
show used = no (most of these are suppressed header 
files, hence not linked, hence not useful)
disable index = yes (saves stripping these out in 
combination script)
2004-12-30 00:25:59 +10:00
stewart@mysql.com
d3d341e7a6 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl2
2004-12-30 00:47:11 +11:00
stewart@mysql.com
c3abe28301 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
2004-12-30 00:42:59 +11: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
joreland@mysql.com
9378af0ed7 wl1804 - ndb - removed debug printout 2004-12-29 08:42:40 +01:00
joreland@mysql.com
ed25dfe2c3 wl1804 - ndb - types in tup, fix dummy usage in handler 2004-12-29 08:39:11 +01:00
stewart@mysql.com
0b82949b6e Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-ports-impl2
2004-12-29 10:23:49 +11:00
stewart@mysql.com
6817a8e6bb Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb
into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port
2004-12-29 10:20:46 +11: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
joreland@mysql.com
52fb0ec534 wl1804 - ndb - add support for _all_ type in NdbScanFilter + TUP 2004-12-28 22:20:37 +01:00