Commit graph

18246 commits

Author SHA1 Message Date
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
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
joreland@mysql.com
bd930e89bc ndb - fix test tools 2004-12-28 17:23:32 +01:00
joreland@mysql.com
20a84d7494 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-28 17:01:51 +01:00
joreland@mysql.com
4ed658dee3 wl2126 - fix ndb part of "latest" ingo patch
(hopefully last :-))
2004-12-28 17:01:07 +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
pekka@mysql.com
471e396e35 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/export/space/pekka/ndb/version/my50-dt
2004-12-28 15:20:20 +01:00
mskold@mysql.com
1552d32853 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb
2004-12-28 14:04:28 +01:00
joreland@mysql.com
64ced8ca09 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2004-12-28 13:56:29 +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
joreland@mysql.com
f14ab8b5a2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-docs
2004-12-28 12:00:02 +01:00
joreland@mysql.com
e4d72dfa63 ndb - Update documentation wrt scans 2004-12-28 11:59:33 +01: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
pekka@mysql.com
6d76317acd ndb: allow Datetime as pk or index key. XXX ordering is wrong before wl-1442 done 2004-12-28 10:36:22 +01: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
marko@hundin.mysql.fi
32757a3466 InnoDB: Fix some bugs in the new record format. (Bug #7493) 2004-12-28 01:34:52 +02:00
serg@serg.mylan
9c12543e18 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-12-27 23:21:06 +01:00
serg@serg.mylan
be93bd0087 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2004-12-27 23:18:25 +01:00
serg@serg.mylan
184cbf6d37 strings/decimal.c
test_d2b2d("123.4", 10, 2, "123.40");
2004-12-27 23:17:09 +01:00
heikki@hundin.mysql.fi
2f9c038ecf row0mysql.c:
Manually merge the latest FOREIGN KEY lock wait + DROP TABLE fix from 4.0
2004-12-27 21:22:06 +02:00