summaryrefslogtreecommitdiff
path: root/sql
Commit message (Collapse)AuthorAgeFilesLines
* manually mergedserg@sergbook.mysql.com2004-12-3117-228/+300
|\
| * post-mergeserg@sergbook.mysql.com2004-12-311-2/+1
| |
| * mergedserg@sergbook.mysql.com2004-12-301-51/+50
| |\
| | * unsufficient privilege checks in GRANT, when a grantor has column-level ↵serg@sergbook.mysql.com2004-12-301-50/+50
| | | | | | | | | | | | privileges
| * | Fix for BUG#7455.timour@mysql.com2004-12-281-1/+10
| | | | | | | | | | | | | | | The fix checks if the trim string argument is NULL. If so, the standard mandates that the function result must be also NULL.
| * | Merge mysql.com:/home/timka/mysql/src/4.1-virgintimour@mysql.com2004-12-272-0/+12
| |\ \ | | | | | | | | | | | | into mysql.com:/home/timka/mysql/src/4.1-dbg
| | * | Fix for BUG#7377. This fix adds the same implementation for ↵timour@mysql.com2004-12-272-0/+12
| | | | | | | | | | | | | | | | ha_myisammgr::index_type as in version 5.0.
| * | | mergeram@gw.mysql.r18.ru2004-12-271-12/+3
| |\ \ \ | | | |/ | | |/|
| | * | A fix (bug #5652: [patch] tcpwrapper support is broken on systems using an ↵ram@gw.mysql.r18.ru2004-12-241-12/+3
| | | | | | | | | | | | | | | | unmodified tcpwrapper).
| * | | sql_table.cc:heikki@hundin.mysql.fi2004-12-271-1/+5
| | | | | | | | | | | | | | | | Return a sensible error code from DISCARD TABLESPACE, if it fails because the table is referenced by a FOREIGN KEY
| * | | ha_innodb.cc:heikki@hundin.mysql.fi2004-12-271-11/+9
| | | | | | | | | | | | | | | | Return a sensible error code from DISCARD TABLESPACE, if it fails because the table is referenced by a FOREIGN KEY
| * | | ha_innodb.cc, row0ins.c, fil0fil.c:heikki@hundin.mysql.fi2004-12-271-1/+1
| | | | | | | | | | | | | | | | Correct typo
| * | | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1heikki@hundin.mysql.fi2004-12-271-14/+1
| |\ \ \ | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/heikki/mysql-4.1
| | * | | Many files:heikki@hundin.mysql.fi2004-12-271-14/+1
| | | | | | | | | | | | | | | | | | | | Fix InnoDB critical bug #7496; we scan the InnoDB data dictionary also at a normal mysqld startup, and create the spaces, so that we know the mapping space id -> .ibd file name; fix an infinite loop if DISCARD TABLESPACE coincides with INSERT or some other table operation; fix a potential crash if DISCARD TABLESPACE coincides with a cascaded FOREIGN KEY operation in the same table; do not allow DISCARD TABLESPACE of a referenced table if FOREIGN_KEY_CHECKS=1
| * | | | Merge rurik.mysql.com:/home/igor/mysql-4.1igor@rurik.mysql.com2004-12-262-6/+12
| |\ \ \ \ | | |/ / / | |/| | | | | | | | into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
| | * | | subselect.result, subselect.test:igor@rurik.mysql.com2004-12-252-6/+12
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test cases for bug #7351. item_cmpfunc.cc: Fixed bug #7351: incorrect result for a query with a subquery returning empty set. If in the predicate v IN (SELECT a FROM t WHERE cond) v is null, then the result of the predicate is either INKNOWN or FALSE. It is FALSE if the subquery returns an empty set. item_subselect.cc: Fixed bug #7351: incorrect result for a query with a subquery returning empty set. The problem was due to not a quite legal transformation for 'IN' subqueries. A subquery containing a predicate of the form v IN (SELECT a FROM t WHERE cond) was transformed into EXISTS(SELECT a FROM t WHERE cond AND (a=v OR a IS NULL)). Yet, this transformation is valid only if v is not null. If v is null, then, in the case when (SELECT a FROM t WHERE cond) returns an empty set the value of the predicate is FALSE, otherwise the result of the predicate is INKNOWN. The fix resolves this problem by changing the result of the transformation to EXISTS(SELECT a FROM t WHERE cond AND (v IS NULL OR (a=v OR a IS NULL))) in the case when v is nullable. The new transformation prevents applying the lookup optimization for IN subqueries. To make it still applicable we have to introduce guarded access methods.
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-12-242-31/+8
| |\ \ \ | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | better fix for bug#7242 (crash in prepared INSERT ... UPDATE)serg@serg.mylan2004-12-242-31/+8
| | | | |
| * | | | 4.0 -> 4.1 mergeSinisa@sinisa.nasamreza.org2004-12-241-5/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0Sinisa@sinisa.nasamreza.org2004-12-231-26/+30
| | |\ \ \ | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0
| | * | | | Fix for a bug #7495Sinisa@sinisa.nasamreza.org2004-12-231-7/+7
| | | | | |
| | * | | | A fix for the bug #7495Sinisa@sinisa.nasamreza.org2004-12-221-2/+2
| | | | | |
| * | | | | Manual merge of changes making GRANTs, which change SSL attributes and/ordlenev@mysql.com2004-12-231-26/+33
| |\ \ \ \ \ | | | |/ / / | | |/| / / | | |_|/ / | |/| | | user limits to behave well on 5.0 tables, into 4.1 tree.
| | * | | Make GRANTs, which change SSL attributes and/or user limits,dlenev@mysql.com2004-12-231-26/+30
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | to behave well on 5.0 tables (well now you can't use tables from 4.1 and 5.0 with 4.0 because former use utf8, but still it is nice to have similar code in acl_init() and replace_user_table()). This also will make such GRANTs working in 5.0 (they are broken now).
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-12-231-17/+33
| |\ \ \ | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | fix indentationwax@kishkin.ru2004-12-231-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add space after comma add space after equal add comments in vio_close_shared_memory()
| | * | | Merge mysql.com:/home/wax/mysql/mysql-4.1wax@mysql.com2004-12-231-1/+10
| | |\ \ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/wax/mysql/mysql-4.1smemory
| | | * | | BUG#6056 wax@kishkin.ru2004-12-141-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (continue) added event_conn_closed replaced WaitForSingleObject on WaitForMultipleObjects inserted a check in vio_close() added SetEvent() for event_conn_closed
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-12-221-1/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-4.1
| | * | | | BitKeeper/triggers/pre-deltaserg@serg.mylan2004-12-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | don't checkin for Administrator or mysqldev sql/log.cc@1.157 restored a bugfix that was lost in a merge
| * | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-12-221-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | * \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-12-221-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | * | | | | changed name of g_eventLogger so it can be used in TransporterRegistry and ↵tomas@poseidon.ndb.mysql.com2004-12-221-1/+1
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | is the same as in the kernel
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2004-12-221-21/+39
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-4.1-smfix
| | * | | | | | Fix for bug #7458 "Microseconds are gobbled from the string result of dlenev@brandersnatch.localdomain2004-12-221-21/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STR_TO_DATE() function if there is another format specifier after %f in format string". Also small cleanup of STR_TO_DATE() implementation. (After review version.)
| * | | | | | | Bugs#7278: Don't open a table if it contains columns with non-supported charsetsbar@mysql.com2004-12-221-8/+29
| | |/ / / / / | |/| | | | |
| * | | | | | ha_innodb.cc:heikki@hundin.mysql.fi2004-12-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a comment that no InnoDB table lock is now acquired in LOCK TABLES if AUTOCOMMIT=1. This helps to avoid deadlocks when porting old MyISAM applications to InnoDB.
| * | | | | | Merge hundin.mysql.fi:/home/heikki/mysql-4.0heikki@hundin.mysql.fi2004-12-221-1/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | | into hundin.mysql.fi:/home/heikki/mysql-4.1
| | * | | | ha_innodb.cc:heikki@hundin.mysql.fi2004-12-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | If AUTOCOMMIT=1, do not acquire an InnoDB table lock in LOCK TABLES; this makes porting of old MyISAM applications to InnoDB easier, since in that mode InnoDB table locks caused deadlocks very easily
| * | | | | Bug#7302: UCS2 data in ENUM field get truncated when new column is addedbar@mysql.com2004-12-214-19/+50
| | | | | |
| * | | | | Bug#6481 - storage_engine system variable allows nonsensical valueacurtis@pcgem.rdg.cyberkinetica.com2004-12-211-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Check that the requested storage engine is enabled.
| * | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ram@gw.mysql.r18.ru2004-12-213-14/+67
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7281
| * | | | | | A fix (bug #7281: RAND(RAND) crashes server).ram@gw.mysql.r18.ru2004-12-201-1/+2
| | |_|_|/ / | |/| | | |
* | | | | | Yet another after merge fix.dlenev@brandersnatch.localdomain2004-12-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now max_user_connections is 36th field in mysql.user table (two new SP-related privileges were added).
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0dlenev@mysql.com2004-12-311-5/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dlenev/src/mysql-5.0-1339
| * | | | | | Fix max_key_length and max_unique_length to take into account varchar and ↵monty@mysql.com2004-12-311-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | null extra lengths This fixes a bug found by bdb.test Fixes a portability issue with bdb tables
* | | | | | | Manual merge.dlenev@mysql.com2004-12-319-42/+199
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Manual merge of patch implementing WL#1339 with main tree.dlenev@mysql.com2004-12-299-42/+199
| |\ \ \ \ \ \
| | * | | | | | WL#1339 "Add per account max_user_connections limit (maximum number dlenev@brandersnatch.localdomain2004-12-299-42/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | | | Merge bk-internal:/home/bk/mysql-5.0vtkachenko@intelp4d.mysql.com2004-12-319-2/+137
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into intelp4d.mysql.com:/users/vtkachenko/bk/mysql-5.0
View Lorry Controller Status