Commit graph

21256 commits

Author SHA1 Message Date
bar@mysql.com
2d8e8c02a5 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1-bug8785
2005-03-16 14:35:44 +04:00
mskold@mysql.com
5fe0884f5e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-03-16 11:34:36 +01:00
mskold@mysql.com
41cddfe6f2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-03-16 11:33:02 +01:00
monty@mysql.com
8e54dece31 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-16 12:03:00 +02:00
jan@hundin.mysql.fi
1f9976cb10 DATA_MYSQL_TRUE_VARCHAR can be DATA_VARCHAR, DATA_BINARY, or
DATA_VARMYSQL so remove unnecessary condition.
2005-03-16 11:26:35 +02: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
jan@hundin.mysql.fi
9a52ffbfa4 Fixed a core dump bug after VARCHAR push in InnoDB. 2005-03-16 10:35:18 +02:00
kent@mysql.com
72e2466c0d mysql-test-run.sh:
Check that there is a disabled.def before using it
disabled.def:
  Reenable ndb tests accidently disabled
2005-03-16 09:23:38 +01:00
lars@mysql.com
197cf9603a Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/bkroot/mysql-4.1
2005-03-16 08:58:48 +01: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
georg@lmy002.wdf.sap.corp
9d3a1420d3 Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/sap/mysql-5.0
2005-03-16 08:56:32 +01:00
georg@lmy002.wdf.sap.corp
a9fde23474 typecast fix for windows 64-bit compilation error 2005-03-16 08:51:57 +01: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
lars@mysql.com
11f93ffd2d Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/b9123-4.1 2005-03-16 08:14:05 +01:00
igor@rurik.mysql.com
ce6c390c39 olap.result, olap.test:
Added a test case for bug #8616.
item.h:
  Fixed bug #8616.
  Added class Item_null_result used in rollup processing.
sql_select.h, sql_select.cc:
  Fixed bug #8616.
  Added JOIN::rollup_write_data to cover rollup queries
  with DISTINCT. Modified other rollup methods.
2005-03-15 22:50:54 -08:00
mskold@mysql.com
515bd1fed8 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-16 07:47:02 +01:00
patg@krsna.
dd669983db WL #2094 Federated Storage Engine
Changes to a test with a update to a table with 1001 columns, the last being a blob. 
On HP, the test worked properly, but on other OSs, there's a problem with using the 
blob column in an update where clause. The field method val_string(String *, char *) 
should work, but doesn't seem to deal with blobd, and for some reason, cannot get
the correct value of the blob column from the byte pointer in update_row, "*old_data"
which is a byte pointer to the row in mysql format, that will be replaced with 
"*new_data" (which conveniently has a field pointer to use to get values from).

Will document this.
2005-03-15 18:49:58 -08: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
monty@mysql.com
1a9e05dd3f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-16 01:30:28 +02:00
monty@mysql.com
fde941e5b4 Partly reverty back patch (in heap-auto-increment-key detection) to ensure that auto_key and auto_key_type are calculated the same way 2005-03-16 01:15:45 +02:00
heikki@hundin.mysql.fi
edf59e5480 Many files:
InnoDB true VARCHAR
2005-03-16 00:34:15 +02:00
reggie@mdk10.(none)
cb4553b774 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into mdk10.(none):/home/reggie/bk/mysql-5.0
2005-03-15 16:34:14 -06: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
mskold@mysql.com
d40e154353 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-15 22:20:57 +01:00
mskold@mysql.com
057d78650e Fix for bug#9166: Cluster compile failure on Solaris 10 2005-03-15 22:19:55 +01:00
petr@mysql.com
b5726acf93 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im-fix-review
2005-03-15 23:21:49 +03:00
petr@mysql.com
28bf536411 IM setup patch. Enable IM instead of mysqld_safe in start/stop script.
Alter RPM to include mysqlmanger binary and config files.
2005-03-15 22:51:13 +03:00
kent@mysql.com
5749c537ed mysql-test-run.sh:
Added feature to disable tests from a list in a file "disabled.def"
  Moved down the code that disables, so that --do-test and --start-from
  don't list the disabled tests not in range.
disabled.def:
  List of test cases to temporarely disable
2005-03-15 19:48:42 +01:00
gluh@gluh.mysql.r18.ru
7a94c8c3e3 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-15 20:58:54 +03:00
gluh@gluh.mysql.r18.ru
fcd50af3c7 Fix for bug #8790:Test 'information_schema': 'Max_data_length' shows 10 * (2 giga - 1) + 9 2005-03-15 20:54:44 +03:00
serg@serg.mylan
ed9c9732c9 sun forte does not define __sun__, only __sun and sun (gcc defines all the three) 2005-03-15 18:45:29 +01: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
serg@serg.mylan
caa29b4776 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-03-15 18:33:43 +01: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
serg@serg.mylan
10c06f257a include/my_global.h
define _XOPEN_SOURCE=500 for solaris
include/my_sys.h
    remove a cast
2005-03-15 18:31:56 +01: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
lars@mysql.com
26fae36137 BUG#9123: If a table name is given with an underscore,
then this must be properly quoted when sent to 
SHOW TABLES LIKE ...
2005-03-15 16:23:02 +01:00
msvensson@neptunus.(none)
3f8a66cbea Merged WL#2269 to mysql-5.0 2005-03-15 15:22:40 +01:00
monty@mysql.com
05acaf060c Merge with global tree 2005-03-15 16:21:08 +02:00
monty@mysql.com
dd4db08438 Code cleanups during review of pushed code 2005-03-15 16:07:28 +02: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
bar@mysql.com
c6c887b990 # Bug#8785 Problem with nested concats and
character set conversion of a string constant.
2005-03-15 17:15:47 +04:00