sergefp@mysql.com
39f412d329
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug9439
2005-04-17 20:56:36 +04:00
sergefp@mysql.com
f9ec5658c7
Merge fix for BUG#9439 from 4.1
2005-04-17 20:54:31 +04:00
lenz@mysql.com
113c883f1d
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0-build
2005-04-17 13:04:29 +02:00
lenz@mysql.com
5126016d3c
Merge mysql.com:/space/my/mysql-4.0-build
...
into mysql.com:/space/my/mysql-4.1-build
2005-04-17 12:48:33 +02:00
lenz@mysql.com
4bc0a01d33
- removed ReadMe.txt from CLEANFILES, as it's cleaned by Docs/Makefile.am
...
already (and that's the Makefile that acutally creates it)
2005-04-17 12:44:59 +02:00
sergefp@mysql.com
ba3795f1d4
Post-merge fixes
2005-04-17 02:10:43 +04:00
sergefp@mysql.com
5147f85c62
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-look-range
2005-04-17 02:06:17 +04:00
sergefp@mysql.com
2ef1963c91
Fix for BUG#9348: when computing union of two intervals set lower bound to
...
minimum of lower bounds of two joined intervals.
2005-04-17 02:05:09 +04:00
petr@mysql.com
8c3312fed3
mysql.server script fixed to use mysqld_safe by default + lots of minor additions
2005-04-16 23:57:15 +04:00
sergefp@mysql.com
6b4e759cf7
Fix for BUG#9439:
...
Changed type of "Sub_part" column in SHOW KEYS from TINYINT to SMALLINT (as MAX_KEY_LENGTH=1024)
(this is the final cset with proper tests)
2005-04-16 23:35:39 +04:00
ingo@mysql.com
e6b8c52808
Merge mysql.com:/home/mydev/mysql-4.1-bug9188
...
into mysql.com:/home/mydev/mysql-5.0-bug9188
2005-04-16 21:01:46 +02:00
ingo@mysql.com
37537b4b2d
Merge mysql.com:/home/mydev/mysql-4.1-bug9487
...
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-16 20:56:21 +02:00
ingo@mysql.com
e2356c71c1
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug9487
2005-04-16 18:56:46 +02:00
ingo@mysql.com
ab0acbe14d
Merge
2005-04-16 17:58:11 +02:00
ingo@mysql.com
e0e3def7c7
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-16 17:44:04 +02:00
monty@mishka.local
571ee3c8f0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-04-16 11:43:03 +03:00
monty@mishka.local
0c03aea1aa
Set bindir, datadir & others if --basedir is given. This ensures that one only has to set basedir in [mysqld] group when moving a binary installation to a not default polace
...
Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf)
Search first for defaults files in basedir and then in datadir (like mysqld_safe)
2005-04-16 11:40:41 +03:00
serg@serg.mylan
62079eca1c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-16 10:14:43 +02:00
monty@mishka.local
de1b1fe54d
Added more rows to test to get predictable results
2005-04-16 10:53:30 +03:00
igor@rurik.mysql.com
285f11064d
Merge rurik.mysql.com:/home/igor/mysql-5.0
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-04-15 22:35:29 -07:00
igor@rurik.mysql.com
d92d4007f2
subselect.result, subselect.test:
...
Added a test case for bug #9516 .
item_subselect.h:
Fixed bug #9516 .
The bug was due to that fact that the class Item_subselect
inherited the generic implementation of the function
not_null_tables that was not valid for the objects
of this class. As a result evaluation of the
not_null_tables attribute was not correct for subqueries.
This caused invalid transformations of outer joins into
inner joins.
2005-04-15 22:08:34 -07:00
igor@rurik.mysql.com
0f043429e4
subselect.result, subselect.test:
...
Added a test case for bug #9338 .
sql_select.cc:
Fixed bug #9338 .
When an occurence of a field reference has to be replaced
by another field reference the whole Item_field must be
replaced.
item.cc:
Fixed bug #9338 .
The method Item_field::replace_equal_field_processor was
replaced by Item_field::replace_equal_field. The new method
is used to replace the occurences of Item_field objects.
item.h:
Fixed bug #9338 .
The virtual function replace_equal_field_processor was replaced
by replace_equal_field. The latter is supposed to be used as a
callback function in calls of the method transform.
2005-04-15 20:43:45 -07:00
monty@mishka.local
c8170b349f
Merge with 4.1
2005-04-16 04:35:54 +03:00
monty@mishka.local
2b322f36d8
Ensure that all privilege tables are created in MyISAM
2005-04-16 04:12:30 +03:00
monty@mishka.local
8d919770c7
Fixed core dump with long timezone names
...
Don't abort on bootstrap if a wrong --default-storage-engine is specified
2005-04-16 03:40:33 +03:00
serg@serg.mylan
5048aa826c
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-16 00:34:05 +02:00
serg@serg.mylan
5fe52ffba4
merged
2005-04-16 00:10:35 +02:00
jimw@mysql.com
ab939dce27
Merge mysql.com:/home/jimw/my/mysql-4.1-9833
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-15 11:52:58 -07:00
jimw@mysql.com
886b8603f4
Merge mysql.com:/home/jimw/my/mysql-4.1-9815
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-15 11:52:35 -07:00
jimw@mysql.com
77f6f5b178
Merge mysql.com:/home/jimw/my/mysql-4.1-9852
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-15 11:51:41 -07:00
ingo@mysql.com
e2cf8b309e
Bug#9487 - myisampack segmentation violation and bus error
...
Fixed some casts for 64-bit systems.
Fixed a possible buffer overflow.
2005-04-15 19:26:38 +02:00
serg@serg.mylan
08ae28f4b8
BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs
...
don't set lex->lock_option=TL_READ in the parser for SELECT
2005-04-15 19:20:15 +02:00
dlenev@brandersnatch.localdomain
6b0b4734d9
Fix for bug #9486 "Can't perform multi-update in stored procedure".
...
New more SP-locking friendly approach to handling locks in multi-update.
Now we mark all tables of multi-update as needing write lock at parsing
stage and if possible downgrade lock at execution stage (For its work
SP-locking mechanism needs to know all lock types right after parsing
stage).
2005-04-15 20:31:47 +04:00
gbichot@quadita2.mysql.com
f0fa1a6f39
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-5.0-4ita
2005-04-15 18:02:22 +02:00
gbichot@quadita2.mysql.com
bc48cda57d
Adding --innodb_fast_shutdown=2 which shuts down InnoDB faster than the default "1":
...
most InnoDB threads are not terminated properly and the buffer pool is not flushed
to disk. Still no committed transaction is lost as we flush the logs to disk.
InnoDB does crash recovery at startup after this shutdown.
Using this shutdown in testsuite (mysql-test-run --mysqld=--innodb_fast_shutdown=2) saved 3 minutes (13% of total time).
2005-04-15 18:00:38 +02:00
ingo@mysql.com
990ebef7f6
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug9188
2005-04-15 17:16:42 +02:00
mskold@mysql.com
40a0548a1b
Bug #9839 Column with AUTOINC contains -1 Value on node stop, post review fix
2005-04-15 16:14:08 +02:00
mskold@mysql.com
e889d234cb
Bug #9839 Column with AUTOINC contains -1 Value on node stop
2005-04-15 15:52:07 +02:00
pem@mysql.comhem.se
da22f75b68
Fixed BUG#9902: Crash with simple stored function using user defined variables
...
... actually, it was a query cache problem. (It shouldn't cache such queries)
2005-04-15 11:06:25 +02:00
msvensson@neptunus.(none)
45c42fddbc
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug9454
2005-04-15 10:16:20 +02:00
msvensson@neptunus.(none)
da386f3134
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/bug9391
2005-04-15 10:13:42 +02:00
konstantin@mysql.com
303af4052e
Add a comment to update_ref_and_keys
2005-04-14 17:47:48 -07:00
jimw@mysql.com
5e581186a4
Fix mysql.server.sh to use shell functions as replacement
...
for LSB init functions when they aren't available. (Bug #9852 )
2005-04-14 17:22:18 -07:00
konstantin@mysql.com
06c5e43c56
A test case for Bug#4956 (decimal -> string conversion problem)
2005-04-14 15:14:34 -07:00
serg@serg.mylan
16a0a6894e
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-14 23:08:12 +02:00
serg@serg.mylan
b07b5f7a6d
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-04-14 22:09:38 +02:00
heikki@hundin.mysql.fi
31a49c3f73
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-14 22:33:17 +03:00
serg@serg.mylan
4757803662
merged
2005-04-14 21:31:22 +02:00
heikki@hundin.mysql.fi
a1f7f57be9
fil0fil.c:
...
Add fault tolerance in the scan of .ibd files at a crash recovery; formerly a single failure of readdir_get_next caused the rest of the directory to be skipped
2005-04-14 22:27:15 +03:00
serg@serg.mylan
533e0551f2
TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode
...
bug#8151
2005-04-14 18:14:54 +02:00