Commit graph

10122 commits

Author SHA1 Message Date
serg@serg.mylan
1354f104cf Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-16 22:40:58 +01:00
patg@krsna.
dcf73493df Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.:/home/patg/test/mysql-5.0
2005-03-16 12:05:58 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
4e0b462612 Merge pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.2
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
2005-03-16 16:27:07 +00:00
serg@serg.mylan
19279b1b03 merged 2005-03-16 17:13:43 +01:00
patg@krsna.
8e376b37d5 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.:/home/patg/test/mysql-5.0
2005-03-16 07:55:56 -08:00
dlenev@mysql.com
5f5203b357 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp
2005-03-16 17:14:08 +03:00
dlenev@mysql.com
8df3d5b098 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-eld-exp
2005-03-16 17:00:13 +03:00
heikki@hundin.mysql.fi
9975f53359 ha_innodb.cc:
Fix bug: InnoDB created all indexes on true VARCHARs as column prefix keys because field->pack_length() for a true VARCHAR is bigger than key_part->length; FOREIGN KEYs could not be created on true VARCHARs then
2005-03-16 15:18:14 +02:00
heikki@hundin.mysql.fi
cb88409e07 data0type.h, row0sel.c:
Fix a crash in a simple search with a key: the dtype->len of a true VARCHAR is the payload maximum len in bytes: it does not include the 2 bytes MySQL uses to store the string length
ha_innodb.cc:
  Fix a crash in true VARCHARs in test-innodb: we passed a wrong pointer to the column conversion in an UPDATE
rowid_order_innodb.result, ps_3innodb.result, innodb.result, endspace.result:
  Edit InnoDB test results to reflect the arrival of true VARCHARs
2005-03-16 14:28:54 +02:00
serg@serg.mylan
99e581ecc1 sql/ha_innodb.cc
protect prepare-...-commit with a mutex to ensure that commits in binlog and in the innodb have the same order
    store binlog position with the commit
2005-03-16 12:45:08 +01:00
dlenev@brandersnatch.localdomain
3da06a5500 Fixed behavior of LOAD DATA with subqueries in SET clause.
The idea is to use TABLE_LIST::lock_type for passing type of lock for
target table to mysql_load() instead of using LEX::lock_option 
(which were rewritten by first subselect in SET clause).

This should also fix potential problem with LOAD DATA in SP
(it is important for them to have right lock_type in the table
 list by the end of statement parsing).
2005-03-16 12:13:35 +03:00
marko@hundin.mysql.fi
19a82124a2 ha_innodb.cc:
calc_row_difference(): Use non-inlined functions to avoid linking error.
2005-03-16 09:56:33 +02:00
serg@serg.mylan
4afb736576 sql/handler.cc
smarter xid-to-str routiine
    fixed assert crash in XA RECOVER
sql/sql_parse.cc
    XA COMMIT/ROLLBACK did not send_ok in some cases
2005-03-16 08:42:06 +01:00
serg@serg.mylan
d7b2d4c541 global read lock code now uses a dedicated mutex
(otherwise a deadlock when ALTER writes to
binlog holding LOCK_open, it causes binlog rotation,
binlog waits for prepared transactions to commit, and commit
needs LOCK_open to check for global read lock)
2005-03-16 08:40:19 +01:00
patg@krsna.
b60a20ce73 WL #2094 Federated Storage Handler.
Edits to ha_federated.cc per Monty, cleanup
2005-03-15 18:41:06 -08:00
dlenev@brandersnatch.localdomain
f169114042 WL#874 "Extended LOAD DATA".
Now one can use user variables as target for data loaded from file
(besides table's columns). Also LOAD DATA got new SET-clause in which
one can specify values for table columns as expressions.

For example the following is possible:
LOAD DATA INFILE 'words.dat' INTO TABLE t1 (a, @b) SET c = @b + 1;

This patch also implements new way of replicating LOAD DATA.
Now we do it similarly to other queries.
We store LOAD DATA query in new Execute_load_query event
(which is last in the sequence of events representing LOAD DATA).
When we are executing this event we simply rewrite part of query which
holds name of file (we use name of temporary file) and then execute it
as usual query. In the beggining of this sequence we use Begin_load_query
event which is almost identical to Append_file event
2005-03-16 04:32:47 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
1a64fe066d Bug#8670
Rework to resolve ambigious grammer: conflict in join expression
  handling of parentheses for nested joins and derived tables.
  Tests included of failing statements
Optimize item construction for AND/OR logical expressions
2005-03-16 00:13:23 +00:00
heikki@hundin.mysql.fi
edf59e5480 Many files:
InnoDB true VARCHAR
2005-03-16 00:34:15 +02:00
reggie@mdk10.(none)
3bfcc5dd75 Merge mdk10.(none):/home/reggie/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-03-15 16:28:47 -06:00
reggie@mdk10.(none)
6c00af77a0 Bug #6660 mysqldump creates bad pathnames on Windows
sql_show.cc:
  changed strdup to thd->memdup per Serg's advice
2005-03-15 16:24:37 -06:00
reggie@mdk10.(none)
aa395b3a45 Merge mdk10.(none):/home/reggie/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-03-15 11:42:31 -06:00
reggie@mdk10.(none)
ef86c0af65 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-03-15 11:37:14 -06:00
reggie@mdk10.(none)
887f2a53fe Bug #6660 mysqldump creates bad pathnames on Windows
This is a modifiction of my previous patch after receiving feedback. This is a better way to fix the problem.  With this patch, data directory and index directory will use only forward slashes (/) when on Windows.

mysqldump.c:
  Removed fixPaths routine.  Was improper fix for bug #6660
sql_show.cc:
  Changed append_directory to convert backslashes to foward slashes when on Windows.
2005-03-15 11:33:06 -06:00
ramil@mysql.com
3f6fdabe4f Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0
2005-03-15 20:06:37 +04:00
ramil@mysql.com
4ee9cc5a98 after merge fix 2005-03-15 19:43:32 +04:00
ramil@mysql.com
d5e3ba70f3 merging 2005-03-15 19:31:52 +04:00
msvensson@neptunus.(none)
3f8a66cbea Merged WL#2269 to mysql-5.0 2005-03-15 15:22:40 +01:00
msvensson@neptunus.(none)
2bdd710d3c WL#2269 Enable query cache for NDB part 2
-This is mostly fixes for correct behaviour when using query cache + transactions + the thread that
fetches commit count from NDB at regular intervals. The major fix is to add a
list in thd_ndb, that keeps a list of NDB_SHARE's that were modified by
transaction and then "clearing" them in ndbcluster_commit.
2005-03-15 15:03:25 +01:00
konstantin@mysql.com
021f8d2170 Cleanup 2005-03-15 16:54:11 +03:00
ramil@mysql.com
04328c3dfa A fix (bug #8799: Killed filesorts can fail inited==RND assertion in ha_rnd_end). 2005-03-15 15:32:11 +04:00
ramil@mysql.com
ec775b65f5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b8799
2005-03-15 14:13:44 +04:00
ramil@mysql.com
46613bafbe A fix (bug #8489: Strange auto_increment behaviour with HEAP table). 2005-03-15 13:32:12 +04:00
patg@krsna.
d0603db72a Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.:/home/patg/test/mysql-5.0
2005-03-15 00:36:38 -08:00
patg@krsna.
24bc862456 This changeset contains changes approved in code review by
Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully 
tested on both my own workstation (Suse 9.0) and production.mysql.com.
2005-03-15 00:32:21 -08:00
sergefp@mysql.com
62465a98e2 Merge mysql.com:/home/psergey/mysql-4.1-bug8510
into mysql.com:/home/psergey/mysql-5.0-bug8510
2005-03-15 09:29:54 +03:00
sergefp@mysql.com
e7e2a8c8eb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8510
2005-03-15 04:09:41 +03:00
konstantin@mysql.com
6a2ef5577c WL#926 "AVG(DISTINCT) and other distincts", part 2 (out of 3): clean up
Item_sum_count_distinct, and
deploy Unique for use with COUNT(DISTINCT) if there is no blob
column in the list of DISTINCT arguments.
2005-03-15 03:46:19 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
98e83555a5 Merge 4.1 - 5.0 2005-03-15 01:14:59 +02:00
serg@serg.mylan
57adc4d740 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-14 20:45:10 +01:00
serg@serg.mylan
f04bef8faf merged 2005-03-14 18:46:30 +01:00
serg@serg.mylan
3613f8c262 sql/log.cc
don't set LOG_EVENT_BINLOG_IN_USE_F for relay logs
sql/sql_repl.cc
    clear LOG_EVENT_BINLOG_IN_USE_F flag before sending an event to a slave
2005-03-14 17:53:24 +01:00
gluh@gluh.mysql.r18.ru
354a93842f Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-14 19:47:46 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
9ec8d87328 Updated error message to be more informative. Previous error message
"Access denied to database mysql" was actually not just misleading, but
also wrong.

Bug#7905.
2005-03-14 16:59:09 +02:00
mskold@mysql.com
f2db341abe Removed unnecessary current_thd 2005-03-14 15:53:44 +01:00
gluh@gluh.mysql.r18.ru
ee434e5cc9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
2005-03-14 17:27:10 +03:00
mskold@mysql.com
7092c7dec2 WL#2353 EXPLAIN support for condition pushdown 2005-03-14 15:26:10 +01:00
serg@serg.mylan
dba1e0889a Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-14 14:47:51 +01:00
msvensson@neptunus.(none)
13ec961c3a BUG#6554 Problem Building MySql on Fedora Core 3
- Moved static variables defined inside of function to file scope to avoid this linking problem on FC3
2005-03-14 12:07:49 +01:00
serg@serg.mylan
ada959edf8 anotehr fix for Item_func_isnotnull::not_null_tables() 2005-03-14 11:04:42 +01:00
serg@serg.mylan
a6b3b8fa98 print more information 2005-03-14 09:27:34 +01:00