mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 14:32:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
16349 commits 2783 branches 343 tags 1.6 GiB
Commit graph

3484 commits

Author SHA1 Message Date
jimw@mysql.com
48fc4cbc6b Merge 2004-12-03 17:48:19 +01:00
serg@serg.mylan
b00395fca8 compatibility fix (2G filesize limit) 2004-12-03 17:35:50 +01:00
mats@mysql.com
fe70f8c747 Merge mysql.com:/space/bkroot/mysql-4.1 
into mysql.com:/space/bk/b6391-mysql-4.1
 2004-12-03 12:15:31 +01:00
mats@mysql.com
2bbdf2403d Bug#6391 (binlog-do-db rules ignored) 
CREATE DATABASE statement used the current database instead of the
  database created when checking conditions for replication.
  CREATE/DROP/ALTER DATABASE statements are now replicated based on
  the manipulated database.
 2004-12-03 12:13:51 +01:00
jimw@mysql.com
4b8e96d5ca Merge 2004-12-03 00:39:55 +01:00
jimw@mysql.com
13649d90ae Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the 
insertion of new records partially failed. It would get logged because of the
logic to log a partially-failed 'INSERT ... SELECT' (which can't be rolled back
in non-transactional tables), but 'CREATE TABLE ... SELECT' is always rolled
back on failure, even for non-transactional tables. (Bug #6682)
(Original fix reimplemented after review by Serg and Guilhem.)
 2004-12-03 00:05:11 +01:00
mskold@mysql.com
cca3fc671f Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-02 14:25:55 +01:00
monty@mysql.com
55cc515c8f merged on pull 2004-12-02 14:47:14 +02:00
hf@deer.(none)
c7ef44857f Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2004-12-02 16:46:30 +04:00
monty@mysql.com
d1a666d59a Cleanups during review stage 
Added auto-correct of field length for enum/set tables for ALTER TABLE
This is becasue of a bug in previous MySQL 4.1 versions where the length for enum/set was set incorrectly after ALTER TABLE
 2004-12-02 14:43:51 +02:00
hf@deer.(none)
71bfbbdcd0 Fixes to make mysql-test-run --embedded-server working 2004-12-02 16:08:17 +04:00
ram@gw.mysql.r18.ru
3b111a9b42 A fix (bug #6878: Crash with engine=memory). 2004-12-02 15:06:15 +04:00
ram@gw.mysql.r18.ru
7ed2753300 A fix (bug #6878: Crash with engine=memory). 2004-12-02 14:34:53 +04:00
ram@gw.mysql.r18.ru
c78eefbc95 Fixes (bug #6932: 'revoke all privileges...' doesn't remove all proper columns from columns_priv 
bug #6933: error in the tests/grant.pl test).
 2004-12-02 13:34:30 +04:00
bar@mysql.com
a09a603d83 Bug #6379: ENUM values are incorrectly converted 
- add_field_to_list() now uses <List>String
instead of TYPELIB to be able to distinguish
literals 'aaa' and hex literals 0xaabbcc.
- move some code from add_field_to_list() where
  we don't know column charset yet, to 
  mysql_prepare_table(), where we do.
 2004-12-02 12:48:43 +04:00
bar@mysql.com
a38160f370 Move common trailing space checks into an include file. 
Check UCS2 trailing spaces.
 2004-12-01 19:25:05 +04:00
joreland@mysql.com
0718f788d6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-12-01 10:15:25 +01:00
joreland@mysql.com
64d6563afa Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-12-01 10:13:55 +01:00
joreland@mysql.com
9acd3ea38d testcase for bug#6871, ndb, replace with collations 2004-12-01 10:13:18 +01:00
bell@sanja.is.com.ua
4c017d18e2 Merge 2004-12-01 10:25:11 +02:00
mskold@mysql.com
da1f5728fd Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-12-01 09:22:26 +01:00
mwagner@mysql.com
2e0d1b3f9c openssl_1.result, have_openssl_1.require, openssl_1.test: 
Update SSL Cipher so that 'openssl_1' test passes (BUG#6152)
 2004-12-01 02:35:02 +01:00
guilhem@mysql.com
81609d6e1c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.1-clean
 2004-11-30 22:22:12 +01:00
guilhem@mysql.com
7219d2be90 two-line fix for BUG#6732 "FLUSH TABLES WITH READ LOCK + COMMIT makes next FLUSH...LOCK hang forever" 
(originally reported as "second run of innobackup hangs forever and can even hang server").
Plus testcase for the bugfix and comments about global read locks.
 2004-11-30 22:20:52 +01:00
bell@sanja.is.com.ua
f20e7a82b7 now we create temporary join for all queries with subqueries to make correct cleunup of tables and avoid too early unlock (BUG#6841) 2004-11-30 21:41:12 +02:00
tomas@poseidon.ndb.mysql.com
abb50b38ee ps_7ndb.result, ps_7ndb.test: 
ndb now runs ps tests just like the others
 2004-11-30 15:08:26 +00:00
mskold@mysql.com
9aca0cdac5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-30 10:21:12 +01:00
ram@gw.mysql.r18.ru
3f741570e9 An additional test for 'CREATE DATABASE' with non-default character set. 2004-11-30 13:19:35 +04:00
ram@gw.mysql.r18.ru
0ca8fd2ee9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b6101
 2004-11-30 12:27:17 +04:00
mskold@mysql.com
18afa572f6 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-30 07:47:52 +01:00
joreland@mysql.com
e86ce67ea5 Merge mysql.com:/home/jonas/src/mysql-4.1-fix 
into mysql.com:/home/jonas/src/mysql-4.1
 2004-11-30 07:43:19 +01:00
joreland@mysql.com
474f23a402 ndb - fixed long overdue problems with unique indexes and null values 2004-11-30 07:41:26 +01:00
tomas@poseidon.ndb.mysql.com
5e799e4a3b ndb_grant.later: 
Rename: mysql-test/t/ndb_grant.test -> mysql-test/t/ndb_grant.later
 2004-11-29 08:06:53 +00:00
mskold@mysql.com
0648cc4285 Added better test for Bug #6794 Wrong outcome of update operation of ndb table 2004-11-28 22:33:01 +01:00
mskold@mysql.com
065184dac3 Fix for Bug #6794 Wrong outcome of update operation of ndb table 2004-11-28 22:28:36 +01:00
serg@serg.mylan
cb538e45f5 post-merge fix 2004-11-28 19:48:41 +01:00
serg@serg.mylan
96729c62be merged 2004-11-28 18:19:01 +01:00
serg@serg.mylan
1a32157950 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-28 16:32:01 +01:00
serg@serg.mylan
7eccc3107f skip last compress test if we're short of RAM 2004-11-28 16:31:14 +01:00
monty@mysql.com
eb304bd49f Fixes while reviewing code 
(Cleanups and better bug fixes)
 2004-11-26 02:31:22 +02:00
bell@sanja.is.com.ua
3c108b2a84 init values to avoid junk returning in case of null value asking without assigning value (BUG#6806) 2004-11-25 22:54:49 +02:00
mats@mysql.com
4ac392fa45 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/bkroot/mysql-4.1
 2004-11-25 13:35:53 +01:00
timour@mysql.com
f1e86036ee Merge mysql.com:/home/timka/mysql/src/4.0-virgin 
into mysql.com:/home/timka/mysql/src/4.0-master
 2004-11-25 13:25:35 +02:00
mats@mysql.com
9ffb3fd39c Merge 2004-11-25 12:23:41 +01:00
timour@mysql.com
38ab93c6be Merge for BUG#3759 which was missing from the main tree for some reason. 2004-11-25 11:37:28 +02:00
mats@mysql.com
fe0911e95e Merge mysql.com:/space/bkroot/mysql-4.0 
into mysql.com:/space/bk/b6148-mysql-4.0
 2004-11-25 09:38:52 +01:00
mats@mysql.com
c06cae0f55 Fix for Bug#6148. Only rewind read position in binary log when the 
slave SQL thread is started.
 2004-11-25 09:26:45 +01:00
serg@serg.mylan
e80bd82e83 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-24 23:47:14 +01:00
serg@serg.mylan
e8203e437a bug#6784 
mi_flush_bulk_insert (on dup key error in mi_write)
was mangling info->dupp_key_pos
 2004-11-24 23:16:16 +01:00
bar@mysql.com
0f79f61480 Bug#6787 LIKE not working properly with _ and utf8 data 2004-11-24 20:09:54 +04:00
serg@serg.mylan
2ca5a0f2b1 merged 2004-11-22 20:15:48 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
076f27147f Bug#6252 - Duplicate columns in keys should fail 
Added check for duplicate column in key
  Added tests and fixed tests which exploit bug
 2004-11-22 18:07:04 +00:00
serg@serg.mylan
eb8d9d3ffe merged with ul 2004-11-22 18:59:17 +01:00
serg@serg.mylan
af51d26238 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-11-22 18:47:23 +01:00
serg@serg.mylan
dca2182fdc ft_boolean_search.c: 
bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
  bug#6705
 2004-11-22 18:37:30 +01:00
serg@serg.mylan
4edd0f3a5e Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-22 16:47:23 +01:00
tomas@poseidon.ndb.mysql.com
a487b87928 added --no-defaults to ndb_drop_table in autodiscover test 2004-11-22 15:05:51 +00:00
serg@serg.mylan
44926664a5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-22 14:55:20 +01:00
serg@serg.mylan
41c33c29a3 Bug #6748 heap_rfirst() doesn't work (and never did!) 
range for BETWEEN typo fixed
 2004-11-22 14:53:18 +01:00
mskold@mysql.com
31f5d69d3a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-22 13:58:50 +01:00
mskold@mysql.com
6cdf1fc96f Added NULL value tests for UNIQUE index 2004-11-22 13:58:11 +01:00
dlenev@mysql.com
7897baf7b1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6462
 2004-11-22 14:21:49 +03:00
dlenev@brandersnatch.localdomain
30f0c495b7 Backport of fix making myisam test results repeatable 2004-11-22 14:17:04 +03:00
mskold@mysql.com
3455e345b2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-22 12:02:32 +01:00
dlenev@mysql.com
64cd633f43 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6462
 2004-11-22 13:06:31 +03:00
dlenev@brandersnatch.localdomain
c37977c87d Fix for bug #6462 "Same request on same data returns different 
results." a.k.a. "Proper cleanup of subqueries is missing for SET and DO
statements". (Version #2 with after-review fixes).

To perform proper cleanup for statements that can contain subqueries 
but don't have main select we must call free_undelaid_joins().
 2004-11-22 13:05:10 +03:00
mskold@mysql.com
f0e95c3704 Added checks for NOT NULL for all fields in UNIQUE INDEX (USING HASH) 2004-11-22 10:35:03 +01:00
bar@mysql.com
e3b94d4ef5 Bug #6737: REGEXP gives wrong result with case sensitive collation: 
- A new flag MY_CS_CSSORT was introduced for case sensitivity.
- Item_func_regexp doesn't substiture ICASE not only
  for binary collations but for case sensitive collations as well.
 2004-11-22 11:58:40 +04:00
konstantin@mysql.com
6337ea8a40 A fix and test case for Bug#6297 "prepared statement, wrong handling 
of <parameter> IS NULL":
we must not only set Item::null_value in Item_param, but implement
Item_param::is_null() to work well with IS NULL/IS NOT NULL clauses.
 2004-11-21 12:04:27 +03:00
dlenev@mysql.com
4e52cc2ded Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6266
 2004-11-19 21:51:37 +03:00
dlenev@mysql.com
aaee135243 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6439
 2004-11-19 21:38:51 +03:00
dlenev@mysql.com
5627dddb93 Manual merge of fix for bug #6439 "from_unixtime() function returns 
wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.
 2004-11-19 19:19:45 +03:00
dlenev@mysql.com
cb7e272e46 Manual merge of fix for bug #6266 "Invalid DATETIME value is not handled 
properly" with main tree.
 2004-11-19 18:35:36 +03:00
bar@mysql.com
770c9be8c2 Bug #6658 MAX(column) returns incorrect coercibility 
Also, Item_sum_hybrid->charset was removed as redundant,
and switched to use collation.collation instead.
 2004-11-19 19:35:36 +04:00
dlenev@mysql.com
40083741ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
 2004-11-19 17:54:14 +03:00
bar@mysql.com
6de458c232 Reuse ctype_common.inc instead of retyping 
the same queries.
 2004-11-19 14:33:55 +04:00
bar@mysql.com
f9d1a5a1c6 Incorrect response with partial utf8 index 2004-11-19 14:25:25 +04:00
tomas@poseidon.ndb.mysql.com
287fe9e313 ndb_grant.result, ndb_grant.test: 
new file
 2004-11-19 09:17:36 +00:00
bell@sanja.is.com.ua
f5e253dc2f reporting empty result added in case of max/min optimisation of ALL/ANY/SOME subqueries 
fixed null processing in NOT operation used in ALL subquery (Bug #6247)
 2004-11-18 18:10:07 +02:00
mskold@mysql.com
7bbee8c95d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
 2004-11-18 15:55:18 +01:00
bar@mysql.com
fe3b359b74 Check that the third UNION part with COLLATE 
clause resolves collation conflict for the
first and the second parts pair.
 2004-11-18 16:15:48 +04:00
mskold@mysql.com
a4d061a5d9 Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key .. 2004-11-18 12:11:56 +01:00
serg@serg.mylan
19067008b8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-11-17 17:54:15 +01:00
guilhem@mysql.com
f04832b52d time independent test 2004-11-17 17:06:24 +01:00
guilhem@mysql.com
d34421c127 Fixes for compilation errors in Windows (casts from uint32* to uint*) in repl and charset code. 
Moving the part of user_var.test using UCS2 to ctype_ucs.test
 2004-11-17 16:41:30 +01:00
serg@serg.mylan
37e872de8c merged 2004-11-17 15:28:37 +01:00
serg@serg.mylan
2d8c21f700 test for bug#5528 2004-11-17 13:38:35 +01:00
bell@sanja.is.com.ua
d5b21d03a5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-global-4.1
 2004-11-17 10:59:04 +02:00
igor@rurik.mysql.com
078597564d Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-11-16 15:07:49 -08:00
igor@rurik.mysql.com
e17073c4a2 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2004-11-16 14:01:40 -08:00
igor@rurik.mysql.com
9edff6c591 key_cache.result, key_cache.test: 
Added a test case for bug #6447.
mf_keycache.c:
  Fixed bug #6447. Erronious code in the key_cache_read function
  caused problems when reading key blocks with offset>0 into
  key cache. The code of key_cache_insert and key_cache_write
  was modified similarly.
 2004-11-16 13:58:49 -08:00
bell@sanja.is.com.ua
bc5a9111d7 backport Serg's fix of FT interface (BUG#6523) 2004-11-16 22:58:02 +02:00
sergefp@mysql.com
1cc999fbd4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-heap-bug
 2004-11-16 21:36:31 +03:00
ram@gw.mysql.r18.ru
dde88ea82b A fix (bug #6449: DO server-crashing bug). 2004-11-16 14:36:25 +04:00
bar@mysql.com
629f1bb616 Bug #6552 CHAR column w/o length is legal, BINARY w/o length is not 2004-11-16 12:05:13 +04:00
bell@sanja.is.com.ua
27395a2fb1 fixed joincleunup to avoid double deletin tables, and too earlyfull cleanup in case of EXPLAIN 
fixed cleunup of TMP_TABLE_PARAM
(BUG#6406)
 2004-11-16 00:16:04 +02:00
bar@mysql.com
8a2ef0a2ca Bug#6608: MySQL server crash in some query with tis620 character set. 
The bug was that the function allocates 'a', then changes the value
of 'a' with the operator ++, and then tries to free 'a'!
 2004-11-15 21:26:16 +04:00
lars@mysql.com
b7cfe5ecad BUG#6353 V2: 
Replication using replicate-rewrite-db did not work for LOAD DATA INFILE.
Now is does.  There was one place in the code that used current database 
instead of the rewrite database.
 2004-11-15 17:03:54 +01:00
dlenev@mysql.com
5ddc564d89 Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime 
values for too big argument".

Added range checking for from_unixtime() argument, cleaned up code 
a bit.
 2004-11-15 16:11:13 +03:00
dlenev@brandersnatch.localdomain
b02f5aa692 Fix for bug #6266 "Invalid DATETIME value is not handled properly". 
In server we assume that datetime values stored in MYSQL_TIME struct
are normalized (and year is not greater than 9999), so we should 
perform range checks in all places then we convert something to
MYSQL_TIME.
 2004-11-15 15:44:29 +03:00