Commit graph

21213 commits

Author SHA1 Message Date
jani@a193-229-222-105.elisa-laajakaista.fi
1fbb61754b Fixed two bugs in MySQL ACL.
First one is related to Bug#7905. One should not be allowed to
create new user with password without UPDATE privilege to
MySQL database. Furthermore, executing the same GRANT statement
twice would actually crash the server and corrupt privilege database.

Other bug was that one could update a column, using the existing
value as basis to calculate the new value (e.g. UPDATE t1 SET a=a+1)
without SELECT privilege to the field (a in the above example)

Fixed tests grant.pl and grant2, which were wrong.
2005-03-17 08:16:56 +02:00
monty@mysql.com
ddec400e18 Merge with global tree 2005-03-17 01:27:04 +02:00
monty@mysql.com
aa6ab3b49c Move handler dependent tests to the specific handler (myisam, bdb, innodb)
Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP
2005-03-17 01:22:12 +02:00
monty@mysql.com
f42941073d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-16 22:59:06 +02:00
patg@krsna.
2f47e3e132 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into krsna.:/home/patg/test/mysql-5.0
2005-03-16 12:56:40 -08:00
dlenev@brandersnatch.localdomain
d8d507926d Fixed binlog.test failure which occured after patch implementing
WL#874 "Extended LOAD DATA" was pushed.
2005-03-16 23:12:27 +03: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
d6c893bb1c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8670.3
2005-03-16 16:57:59 +00: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
heikki@hundin.mysql.fi
4bf1d9e445 data0data.c:
Allow also long VARCHARs to be stored externally, not just BLOBs; fixes a bug reported by Trudy Pelzer; needs more testing
2005-03-16 18:05:08 +02:00
joerg@mysql.com
9d0b81880c Manual merge: Do not re-use the same identifier at loop level within a function (IRIX!). 2005-03-16 17:05:07 +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@brandersnatch.localdomain
357abac3a4 Small fix to innodb.test that Heikki probably simply forgot to commit. 2005-03-16 18:48:13 +03: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
monty@mysql.com
594ef41b2d Cleanup during reviews
Removed some optional arguments
Fixed portability problem in federated tests
2005-03-16 16:11:01 +02: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
dacb591222 subselect2.result:
Update key lengths in EXPLAIN to reflect true VARCHARs
2005-03-16 15:26:07 +02: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
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
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
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
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
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