Commit graph

15194 commits

Author SHA1 Message Date
dlenev@brandersnatch.localdomain
75d816627c Fix for bug #6173 "One can circumvent missing UPDATE privilege if
he has SELECT and INSERT privileges for table with primary key"

Now we set lex->duplicates= DUP_UPDATE right in parser if INSERT has
ON DUPLICATE KEY UPDATE clause, this simplifies insert_precheck()
function (this also fixes a bug) and some other code.
2004-10-20 16:04:43 +04:00
joerg@mysql.com
1354b1bd5d New tests for bug#1644 and bug#1676,
test for bug#1180 changed to table naming scheme 't#'.
2004-10-15 12:56:57 +02:00
joerg@mysql.com
09c09f04fb Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-10-15 10:34:40 +02:00
matt@mysql.com
60385695b4 TAG:
Tagged ChangeSet 1.2091 as mysql-4.1.6
configure.in:
  Updated version string to 4.1.7
2004-10-15 00:55:50 -05:00
konstantin@mysql.com
105a2c1c03 Fix for Bug#6024 "Test "client_test" fails in 4.1.6-gamma build (1)":
let's not assume that char is signed (its signedness is not defined).
The server was also affected by the wrong typedef.
2004-10-15 03:54:40 +04:00
konstantin@mysql.com
60fc4ed057 libmysql/libmysql.c:
Fix for Bug#6025 "Test "client_test" fails in 4.1.6-gamma build (2)".
 No need for a test case, the bug is covered already.
2004-10-15 02:52:52 +04:00
konstantin@mysql.com
f79ca4e43d compile-hpux11-parisc2-aCC:
Fix a typo. Cleanup.
2004-10-15 00:36:45 +04:00
lenz@mysql.com
494731501d Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-10-14 18:32:36 +02:00
lenz@mysql.com
6deabf8ab1 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2004-10-14 18:30:52 +02:00
lenz@mysql.com
a524835cdd - Cleanup: removed unreferenced local variable "local_file" in mysqlimport.c 2004-10-14 16:52:00 +02:00
bell@sanja.is.com.ua
3aaae0e390 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-10-14 17:48:28 +03:00
lenz@mysql.com
db3a6ebfe8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2004-10-14 14:58:58 +02:00
lenz@mysql.com
8c496b487f - added missing file strings/my_strtoll10.c to the libmysql.dsp and
mysqlclient.dsp project files
2004-10-14 14:54:06 +02:00
bell@sanja.is.com.ua
883883b015 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-10-14 15:48:45 +03:00
bar@mysql.com
299297d4a9 ctype_utf8.test, ctype_utf8.result:
Wrong handler.
2004-10-14 16:40:03 +05:00
bar@mysql.com
e827839619 Bug #6019 SELECT tries to use too short prefix index on utf8 data 2004-10-14 16:36:29 +05:00
joerg@mysql.com
0290e159fb There were no tests for bug#1644 and bug#1676, added them now. 2004-10-14 13:22:25 +02:00
bar@mysql.com
48120f77eb ctype_utf8.test:
Bug#6086 "ctype_utf8" test fails when MySQL does not include InnoDB support
2004-10-14 15:29:07 +05:00
bell@sanja.is.com.ua
1729ec2ac6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-10-14 12:50:00 +03:00
bar@mysql.com
2f8f0f2eb2 Bug #6043 erratic searching for diacriticals in indexed MyISAM UTF-8 table 2004-10-14 14:14:50 +05:00
konstantin@mysql.com
9b2cc44e74 Followup to Bug#5985: fixing one thing that went wrong. 2004-10-14 03:37:20 +04:00
konstantin@mysql.com
7c95fa7085 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/media/sda1/mysql/mysql-4.1-5985
2004-10-14 02:54:44 +04:00
konstantin@mysql.com
5abc3de22b A fix and test case for Bug#5985 ""prepare stmt from "select rand(?)"
crashes server." The fix makes Item_func_rand prepared-statements
aware plus it fixes the case when RAND is used in prepared
statements and replication is on (as well as several similar issues).
Until now we did not reset THD before every execution of a prepared
statement, so if some execution had set thd->time_zone_used
or thd->rand_used they would not be reset until next mysql_parse.
Some of post-review fixes done.
2004-10-14 02:53:59 +04:00
bell@sanja.is.com.ua
8db65bd6ae Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2004-10-13 23:25:36 +03:00
heikki@hundin.mysql.fi
5fa601111e srv0srv.c, log0log.c, srv0srv.h, ha_innodb.cc, ha_innodb.h:
Implement innobase_very_fast_shutdown and innobase_start_trx_and_assign_read_view(); these were requested by Guilhem
2004-10-13 20:04:52 +03:00
ingo@mysql.com
6809db3d03 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1
2004-10-13 17:57:17 +02:00
ingo@mysql.com
e21e236d33 BUG#4286 - HANDLER tables are closed by FLUSH TABLE(S).
BUG#4335 - one name can be handler open'ed many times.
Fixed problems detected on Windows build by VC++.
Removed unused variables.
Applied a neccessary cast.
2004-10-13 17:42:22 +02:00
konstantin@mysql.com
09b50375ed tests/client_test.c:
Make checks (asserts) performed in client_test.c work in non-debug
  builds.
2004-10-13 19:27:07 +04:00
marko@hundin.mysql.fi
ab316c36db InnoDB: correct potential overflow in trx_purge() 2004-10-13 11:29:57 +03:00
tomas@poseidon.ndb.mysql.com
b40261262a fix for some build/test errors for 4.1.6 2004-10-13 00:38:43 +00:00
konstantin@mysql.com
1ac41c9285 Move Heikki's comment about thd->query comment to proper place
(bad merge from 4.0)
2004-10-13 00:17:37 +04:00
mwagner@here.mwagner.org
06245b4508 post-commit:
Added catch for (example) WL#1234 into bk commit subjects
2004-10-12 15:08:58 -05:00
konstantin@mysql.com
cc57252bb7 ps.test, ps.result: a test case for Bug#6042 "constants
propogation works only once (prepared statements)".
2004-10-12 21:16:07 +04:00
joerg@mysql.com
ae8800d8d3 New tests for prepared statements:
- 'ps_10nestset' uses a "nested set" approach for an employee 
  hierarchy, then does arithmetic on the "salary" field;
  (soon) to be extended by inserts / deletes which imply
  mass updates on the "l"/"r" fields showing the set inclusion,
- 'ps_11bugs' will get (some of ?) those bug DB entries which
  refer to prepared statements, but whose number does not appear
  in a test file comment - so it will also be extended.
2004-10-12 16:00:50 +02:00
konstantin@mysql.com
f063a81755 item.h:
A fix for Bug#6042 "constants propogation works olny once (prepared
  statements)": reset item->marker in Item::cleanup, as it's used
  in propogate_cond_constants. No test case as the only way I could
  come up with to show the problem is EXPLAIN, and EXPLAIN is painful
  to use in the test suite.
2004-10-12 17:33:13 +04:00
pekka@mysql.com
abf1b8fbc3 NDB compile fix sol9x86 2004-10-12 14:07:41 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9001573040 Added documentation. 2004-10-11 23:59:37 +03:00
tomas@poseidon.ndb.mysql.com
dbd73895d2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-11 20:59:36 +00:00
tomas@poseidon.ndb.mysql.com
1b35f6b469 another order by fix for ndb 2004-10-11 20:58:48 +00:00
jani@a193-229-222-105.elisa-laajakaista.fi
520d875015 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2004-10-11 20:55:36 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
4d55c4a321 Improved mysqld_multi documentation, especially the --example
section, which had gotten somewhat out-dated.
2004-10-11 20:54:48 +03:00
ram@gw.mysql.r18.ru
e970eab39d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5382
2004-10-10 16:31:42 +05:00
tomas@poseidon.ndb.mysql.com
f3d002c1b6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-10 11:31:41 +00:00
ram@gw.mysql.r18.ru
0962ac560f clean-up, indentation fixes. 2004-10-10 15:29:06 +05:00
ram@gw.mysql.r18.ru
48305dcd69 A fix (bug #5382: Server crashes after writing INTO OUTFILE) 2004-10-10 14:40:24 +05:00
tomas@poseidon.ndb.mysql.com
c5020e3b4c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-10-10 08:32:15 +00:00
tomas@poseidon.ndb.mysql.com
060707c2f1 Fixes bug with tableImpl with blobs not being initialized properly w.r.t pointer to blob tableImpl in column
added blob to test to see that blob tables don't show up in show tables
    auto increment setting need not fetch blob tables (will otherwise generate error during table creation)
    moved addBlobTables out of fetchGlobalTableImpl to get_local_table_info
    changed addBlobTables to start from last column and break if all blobs added
    also addBlobTables will return -1 if failed (typically getTable)
    changed to using get_local_table_info with internal table name where applicable for efficiency
    added option to get_local_table_info wether to fetch blob tables or not
    getTable always fetches the blobtables
    moved addBlobTables to get_local_table_info to always be called, even if main table goes to cache only
2004-10-10 08:31:45 +00:00
ram@gw.mysql.r18.ru
5e352defa5 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.gconcat
2004-10-10 12:35:39 +05:00
ram@gw.mysql.r18.ru
5f857a7a82 Blob support for the group_concat() function.
(Bug #4315: GROUP_CONCAT with ORDER BY returns strange results for TEXT fields
 Bug #5564: Strange behaviour with group_concat and distinct
 Bug #5970: group_concat doesn't print warnings)
2004-10-10 12:10:53 +05:00
konstantin@mysql.com
703e396b6e A small simplification: perform two actions at once, register a
change, and perform it (the new Item changes registry).
2004-10-10 03:10:00 +04:00