mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15422 commits 2791 branches 343 tags 1.7 GiB
Commit graph

3230 commits

Author SHA1 Message Date
konstantin@mysql.com
e3abcb6b53 A fix and test case for Bug#6088 "FOUND_ROWS returns wrong values for 
prepared statements when LIMIT is used" and post-review comments.
The fix changes the approach we calculate the need for ORDER BY 
in UNION: the previous was not PS friendly, as it damaged SELECT_LEX 
options in case of single select.
 2004-10-22 22:51:16 +04:00
konstantin@mysql.com
33c97a499b Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/media/sda1/mysql/mysql-4.1-6050
 2004-10-22 15:59:58 +04:00
konstantin@mysql.com
a7c52d755b A fix and test case for Bug#6050 "EXECUTE stmt reports ambiguous field 
names with ident. tables fr. diff. schemata": revise all uses of
Item_field and make them prepared-statements friendly when necessary.
 2004-10-22 14:47:35 +04:00
kent@mysql.com
7a640b44dd mysqltest.c, mysqltest.result, mysqltest.test: 
Added SQLSTATE matching support to test engine
mysqltest.result, mysqltest.test:
  new file
 2004-10-22 05:56:27 +02:00
joerg@mysql.com
a7d054d18f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/M41/mysql-4.1
 2004-10-21 17:57:48 +02:00
joerg@mysql.com
a77d91e82e Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-10-21 17:47:05 +02:00
ram@gw.mysql.r18.ru
136652522e A fix (bug #6138: MOD operator should not round non-integral argument). 2004-10-21 19:52:55 +05:00
joerg@mysql.com
61ca493a8d Adapt 'ps_10nestset' to standard test style; correct a typing error in 'ps_11bugs'. 2004-10-21 16:02:12 +02:00
bar@mysql.com
e28976e0ef Bug #5679 utf8_unicode_ci LIKE--trailing % doesn't equal zero characters 2004-10-21 14:48:37 +05:00
bar@mysql.com
e9fde8f54e Allow cp932 characters to be stored in a SJIS column 2004-10-21 12:17:59 +05:00
tomas@poseidon.ndb.mysql.com
eda3eb378d Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-20 17:31:59 +00:00
tomas@poseidon.ndb.mysql.com
8ae6219c26 fix so that ndb handler can cope with char(0), mapped to char(1) for now 2004-10-20 17:22:58 +00:00
monty@mysql.com
b686f98f50 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-10-20 18:58:01 +03:00
monty@mysql.com
4e63fb9891 After merge fixes 2004-10-20 17:28:40 +03:00
monty@mysql.com
e1218474b8 Merge with 4.0 2004-10-20 16:24:28 +03:00
monty@mysql.com
b32ffec8fd Fix test case for innodb-lock 2004-10-20 16:04:28 +03:00
dlenev@mysql.com
a10ce662b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-secfix
 2004-10-20 17:02:15 +04:00
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
monty@mysql.com
1f8b3d0f22 Code cleanups (done during review of new code) 
Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
 2004-10-20 11:24:08 +03:00
tomas@poseidon.ndb.mysql.com
8476fe9757 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-19 15:00:02 +00:00
tomas@poseidon.ndb.mysql.com
aed0390662 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-18 13:39:19 +00:00
bar@mysql.com
47f638054e Bug #6139 UNION doesn't understand collate in the column of second select 2004-10-18 17:56:25 +05:00
tomas@poseidon.ndb.mysql.com
60cf2213fd Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-18 12:12:02 +00:00
bar@mysql.com
1596d46528 Bug #6040 can't retrieve records with umlaut characters in case insensitive manner 2004-10-18 15:23:24 +05:00
jan@hundin.mysql.fi
3c49aa7cfa Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
 2004-10-16 08:17:50 +03: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
joreland@mysql.com
273209d259 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-10-15 08:11:45 +02:00
joreland@mysql.com
f5e57076d2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-10-15 08:10:08 +02:00
jan@hundin.mysql.fi
d0930b8efd Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/talle/mysql-4.1
 2004-10-15 08:24:58 +03:00
jan@hundin.mysql.fi
d07ade5579 This patch removes unnecessary lock from the supremum record, takes 
X-locks on duplicates also on LOAD DATA...REPLACE clause and
fixes a bug #6086 adding --disable_warnings and --enable_warnings around
the create table clauses in ctype_utf8 tests for InnoDB.
 2004-10-14 15:36:36 +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
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
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
joreland@mysql.com
57612c479f Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-10-13 10:19:28 +02:00
joreland@mysql.com
29c270c13e Bug#6020, any lock >= write_allow_write is a write lock 2004-10-13 10:08:18 +02: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
joreland@mysql.com
4041575a46 Fix order by 2004-10-12 07:20:38 +02:00
guilhem@mysql.com
c84737d6e8 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-10-11 11:02:24 +02:00
guilhem@mysql.com
13af58aab6 Fix for BUG#5949 "error code 1223 in binlog when using innobackup": 
when one connection had done FLUSH TABLES WITH READ LOCK, some updates, and then COMMIT,
it was accepted but my_error() was called and so, while client got no error, error was logged in binlog.
We now don't call my_error() in this case; we assume the connection know what it does.
This problem was specific to 4.0.21. The change is needed to make replication work with existing versions of innobackup.
 2004-10-11 11:01:38 +02:00
tomas@poseidon.ndb.mysql.com
f05a92ce4b Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-10 14:08:18 +00: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
tomas@poseidon.ndb.mysql.com
252c14049e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb-merge
 2004-10-10 10:03:10 +00: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