Commit graph

37805 commits

Author SHA1 Message Date
jani@hynda.mysql.fi
28b2b89013 Merge hynda.mysql.fi:/home/my/mysql-5.0-main
into  hynda.mysql.fi:/home/my/mysql-5.0-marvel
2007-08-22 16:19:06 +03:00
gshchepa/uchum@gleb.loc
f3d0f62d10 Fixed bug #30201.
Killing a SELECT query with KILL QUERY or KILL CONNECTION
causes a server crash if the query cache is enabled.

Normal evaluation of a query may be interrupted by the
KILL QUERY/CONNECTION statement, in this case the mysql_execute_command
function returns TRUE, and the thd->killed flag has true value.
In this case the result of the query may
be cached incompletely (omitting call to query_cache_insert inside
the net_real_write function), and next call to query_cache_end_of_result
may lead to server crash.
Thus, the query_cache_end_of_result function has been modified to abort
query cache in the case of killed thread.
2007-08-22 18:15:54 +05:00
joerg@trift2.
cd1561d5a8 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-08-21 18:24:01 +02:00
jani@hynda.mysql.fi
bca8c4d353 Merge hynda.mysql.fi:/home/my/mysql-5.0-main
into  hynda.mysql.fi:/home/my/mysql-5.0-marvel
2007-08-21 19:06:47 +03:00
gshchepa/uchum@gleb.loc
86768df764 Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-21 20:56:40 +05:00
thek@adventure.(none)
88107378cd Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-08-21 17:47:06 +02:00
gshchepa/uchum@gleb.loc
c652d3df95 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30287
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-21 19:30:32 +05:00
gluh@mysql.com/eagle.(none)
4446fd4b0d compiler warning fix 2007-08-21 18:59:42 +05:00
gluh@eagle.(none)
9bae69b299 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-08-21 17:57:48 +05:00
thek@adventure.(none)
acfe3fc924 Bug#30269 Query cache eats memory
Although the query cache doesn't support retrieval of statements containing
column level access control, it was still possible to cache such statements
thus wasting memory.
  
This patch extends the access control check on the target tables to avoid
caching a statement with column level restrictions. 

Views are excepted and can be cached but only retrieved by super user account.
2007-08-21 13:43:09 +02:00
gshchepa/uchum@gleb.loc
4c144f6349 Merge gleb.loc:/home/uchum/work/bk/5.0
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-21 16:31:30 +05:00
gshchepa/uchum@gleb.loc
d1b4cee88f Merge gleb.loc:/home/uchum/work/bk/5.0
into  gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-21 16:14:46 +05:00
gshchepa/uchum@gleb.loc
5d3809c264 Fixed bug #30287.
The server created temporary tables for filesort in the working directory
instead of the specified tmpdir directory.
2007-08-21 01:39:39 +05:00
tsmith@ramayana.hindu.god
dcd94251d4 Bug #27694: mysqlhotcopy & p5-DBD-mysql51-4.003
Use "SHOW TABLES FROM `db`" instead of $dbh->tables() in the
get_list_of_tables() routine.

The symptom is that, when used with recent versions of DBD::mysql,
mysqlhotcopy uses a double-qualified table name, for example:

Invalid db.table name 'test.test`.`x' at /usr/bin/mysqlhotcopy line 855.

This is caused by a change in DBD::mysql.  See this diff:

http://svn.perl.org/viewcvs/modules/DBD-mysql/trunk/lib/DBD/mysql.pm?r1=9183&r2=9188

Basically, older DBD::mysql implemented a limited ->table_info method;
now the full method is implemented, and as a result DBI's ->tables()
method has access to the schema value, so it uses it.
2007-08-20 11:00:51 -06:00
malff/marcsql@weblab.(none)
8d507c5897 Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-08-20 10:45:16 -06:00
lzhou/zhl@dev3-63.(none)
0f22183652 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug29674
2007-08-20 15:29:59 +00:00
lzhou/zhl@dev3-63.(none)
2093858fff BUG#29674 Remove warning in pushbuild in 5.0 2007-08-20 14:57:04 +00:00
jperkin@production.mysql.com
e288730abe Fix bug#27520. For some unknown reason, libtool.m4 attempts
to find "ar" but if it cannot be found sets AR=false.  This
leads to confusing failures during the build rather than at
configure time.

We have our own checks for ar, but as AR was already set
earlier by the libtool tests they were never exectuted.

Therefore, update the tests so that we catch any libtool
failures, and run AC_CHECK_PROG explicitly to ensure that we
see sensible output from configure prior to any potential
failure.
2007-08-20 16:14:35 +02:00
msvensson@pilot.(none)
6d00495cbb Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-20 13:48:27 +02:00
msvensson@pilot.(none)
f773863767 Merge pilot.(none):/data/msvensson/mysql/work/my50-work
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-20 13:46:57 +02:00
msvensson@pilot.(none)
0b80907150 Only install second master db if using second master 2007-08-20 13:46:42 +02:00
lzhou/zhl@dev3-63.(none)
804684c292 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug29674
2007-08-20 10:59:14 +00:00
lzhou/zhl@dev3-63.(none)
d48067537b BUG#29674 add install data of the new test case in makefile.am 2007-08-20 10:47:09 +00:00
gluh@eagle.(none)
6dda1f8be1 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-08-20 11:25:45 +05:00
gluh@mysql.com/eagle.(none)
7a8fd4107d Bug#27629 Possible security flaw in INFORMATION_SCHEMA and SHOW statements
added SUPER_ACL check for I_S.TRIGGERS
2007-08-20 11:23:08 +05:00
tsmith@ramayana.hindu.god
88444351c2 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-18 00:35:41 -06:00
thek@adventure.(none)
35533f9d8f Merge adventure.(none):/home/thek/Development/cpp/bug30269/my50-bug30269
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
2007-08-17 17:27:41 +02:00
thek@adventure.(none)
a4248c2dd3 Bug #30269 Query cache eats memory
Although the query cache doesn't support retrieval of statements containing
column level access control, it was still possible to cache such statements
thus wasting memory.

This patch extends the access control check on the target tables to avoid
caching a statement with column level restrictions.
2007-08-17 16:55:20 +02:00
evgen@moonbone.local
9a83ddda69 Bug#30245: A wrong type of a BIT field is reported when grouped by it.
HEAP tables can't index BIT fields. Due to this when grouping by such fields is
needed they are converted to a fields of the LONG type when temporary table
is being created. But a side effect of this is that a wrong type of BIT
fields is returned to a client.

Now the JOIN::prepare and the create_distinct_group functions are create
additional hidden copy of BIT fields to preserve original fields untouched.
New hidden fields are used for grouping instead.
2007-08-17 18:30:41 +04:00
igor@olga.mysql.com
3d44204e84 Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30396
2007-08-16 21:04:28 -07:00
davi@moksha.local
d669228006 Bug#29936 (Stored Procedure DML ignores low_priority_updates setting)
This is a follow up for the patch for Bug#26162 "Trigger DML ignores low_priority_updates setting", where the stored procedure ignores the session setting of low_priority_updates.

For every table open operation with default write (TL_WRITE_DEFAULT) lock_type, downgrade the lock type to the session setting of low_priority_updates.
2007-08-16 14:51:37 -03:00
tsmith@ramayana.hindu.god
49891223c3 Bug #29474: 21587 Regression Ever increasing open tables/fd when using HANDLER READ + DELETE
Revert the fix for bug 21587.  That bug will be re-opened, and a new
fix must be created.
2007-08-16 10:56:09 -06:00
jani@hynda.mysql.fi
c31c8fc93d Fix for Bug#27970 "Fix for bug 24507 makes mysql_install_db fail" 2007-08-16 17:25:48 +03:00
mhansson@dl145s.mysql.com
4fdadd620d Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  dl145s.mysql.com:/data0/mhansson/my50-bug28570
2007-08-16 14:13:07 +02:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
921cba22bc Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge
2007-08-16 11:06:41 +08:00
malff/marcsql@weblab.(none)
c6a395af09 Bug#23062 (GCOV build: helper scripts missing in the BUILD directory)
This patch provides compile helper scripts only,
no server logic is affected.

Before this patch, GCOV and GPROF build scripts were only provided for
pentium platforms.

With this patch, pentium, pentium64 and amd64 platforms have associated
helper build scripts.

The GCOV and GPROF specific compilation flags are set once in SETUP.sh,
to avoid code duplication.
2007-08-15 18:10:16 -06:00
tsmith@ramayana.hindu.god
5e926bc120 NULL MERGE this ChangeSet to 5.1
Apply innodb-5.0-ss1696 snapshot

Fixes:
- Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB
- Bug#23710: crash_commit_before fails if innodb_file_per_table=1
  At InnoDB startup consider the case where log scan went beyond
  checkpoint_lsn as a crash and initiate crash recovery code path.
- Bug#28781: InnoDB increments auto-increment value incorrectly with ON DUPLICATE KEY UPDATE
  We need to do some special AUTOINC handling for the following case:
  INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ...
  We need to use the AUTOINC counter that was actually used by
  MySQL in the UPDATE statement, which can be different from the
  value used in the INSERT statement.
- Bug#29097: fsp_get_available_space_in_free_extents() is capped at 4TB
  Fix by typecasting the variables before multiplying them, so that the
  result of the multiplication is of type "unsigned long long".
- Bug#29155: Innodb "Parallel recovery" is not prevented
  Fix by enabling file locking on FreeBSD.  It has been disabled because
  InnoDB has refused to start on FreeBSD & LinuxThreads, but now it
  starts just fine.
2007-08-15 17:20:54 -06:00
tsmith@ramayana.hindu.god
e2d64f2878 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-15 15:48:03 -06:00
davi@moksha.local
d4aad35095 Rework doxygen documentation for the function mysql_ha_close_table. 2007-08-15 17:12:09 -03:00
lars/lthalmann@dl145h.mysql.com
0498177909 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-08-15 21:50:38 +02:00
lars/lthalmann@dl145k.mysql.com
4000c96a70 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-08-15 21:26:47 +02:00
lars/lthalmann@mysql.com/dl145k.mysql.com
75925a197c Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
2007-08-15 21:26:10 +02:00
igor@olga.mysql.com
d790ec42e1 Fixed bug #30396.
The bug caused memory corruption for some queries with top OR level
in the WHERE condition if they contained equality predicates and 
other sargable predicates in disjunctive parts of the condition.

The corruption happened because the upper bound of the memory
allocated for KEY_FIELD and SARGABLE_PARAM internal structures
containing info about potential lookup keys was calculated incorrectly
in some cases. In particular it was calculated incorrectly when the
WHERE condition was an OR formula with disjuncts being AND formulas
including equalities and other sargable predicates.
2007-08-15 10:24:18 -07:00
lzhou/zhl@dev3-63.(none)
c8b88e4ceb Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj
into  dev3-63.(none):/home/zhl/mysql/mysql-5.0/bug29674
2007-08-15 16:28:27 +00:00
davi@moksha.local
c290b26c0e Bug#25856 (HANDLER table OPEN in one connection lock DROP TABLE in another one)
mysql_ha_open calls mysql_ha_close on the error path (unsupported) to close the (opened) table before inserting it into the tables hash list handler_tables_hash) but mysql_ha_close only closes tables which are on the hash list, causing the table to be left open and locked.

This change moves the table close logic into a separate function that is always called on the error path of mysql_ha_open or on a normal handler close (mysql_ha_close).
2007-08-15 12:13:34 -03:00
evgen@moonbone.local
222fddcb79 mysql_client_test.c:
Post fix for the bug#29948.
2007-08-15 18:21:58 +04:00
joerg@trift2.
c74b8577ee Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-08-15 12:59:51 +02:00
mhansson/martin@linux-st28.site
1da8451d4d bug#28570: handler::index_read() is called with different find_flag when
ORDER BY is used

The range analysis module did not correctly signal to the 
handler that a range represents a ref (EQ_RANGE flag). This causes 
non-range queries like 
SELECT ... FROM ... WHERE keypart_1=const, ..., keypart_n=const 
ORDER BY ... FOR UPDATE
to wait for a lock unneccesarily if another running transaction uses
SELECT ... FOR UPDATE on the same table.

Fixed by setting EQ_RANGE for all range accesses that represent 
an equality predicate.
2007-08-15 09:23:44 +02:00
evgen@moonbone.local
1cc8f0e383 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/29948-bug-5.0-opt-mysql
2007-08-14 18:16:34 +04:00
mskold/marty@linux.site
822fd77ab2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
2007-08-14 15:34:04 +02:00