mskold@mysql.com
8f7bb4eced
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-20 11:26:57 +02:00
mskold@mysql.com
c9e68705bb
Removed forgotten abort() call, bug#10001
2005-04-20 11:08:53 +02:00
sergefp@mysql.com
f284512ce0
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/psergey/mysql-4.1-bug9103
2005-04-20 12:11:06 +04:00
lenz@mysql.com
cf152b156d
- Enabled the "blackhole" storage engine for the Max RPM subpackage
2005-04-20 08:39:08 +02:00
igor@rurik.mysql.com
25c396628a
sql_select.cc:
...
Fixed bug #9681 .
The bug happened with queries using derived tables specified by
a SELECT with ROLLUP, such as:
SELECT * FROM (SELECT a, SUM(a) FROM t1 GROUP BY a WITH ROLLUP) t2,
if column a of table t1 is declared as NOT NULL.
This was to the fact that the first column of the temporary table
created to contain the derived table erroneously inherited the NOT NULL
attribute from column a.
olap.result, olap.test:
Added a test case for bug #9681 .
2005-04-19 16:54:30 -07:00
mskold@mysql.com
dbd035818b
Disabled ndb tests for embedded
2005-04-19 17:23:49 +02:00
lenz@mysql.com
814b4aa2eb
- manual merge
2005-04-19 17:18:56 +02:00
lenz@mysql.com
a42c7d442e
- added missing copyright headers to several Makefile.am's (noticed
...
while testing changes to the mysql-copyright scripts
2005-04-19 17:00:05 +02:00
ingo@mysql.com
792b816b1b
Bug#7806 - insert on duplicate key and auto-update of timestamp
...
Modified the check for the timestamp field so that the flags for
the automatic for inserts and updates are cleared independently.
2005-04-19 15:12:32 +02:00
lenz@mysql.com
04a4680b8b
Updated Docs/Makefile.am:
...
- fixed copyright header and removed obsolete comments about how to
build the manual using texinfo
- added an "install-data-hook" to install the mysql.info info page.
This seems to be the only way to install info pages, if they are not
built from texinfo sources directly.
2005-04-19 13:33:38 +02:00
msvensson@neptunus.(none)
4a4c9017ad
BUG#9568 mysql segfaults from CTRL-R
...
- Segfault because of passing a 64-bit pointer to 32 bit integer.
- Add new include config_readline.h which will calculate some new defines
based on what is found in config.h
- This file was originally included in readline 4.3 as config.h.in, only the part that
makes new defines have been moved to this file.
2005-04-19 13:12:19 +02:00
jan@hundin.mysql.fi
bd10055a7e
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/jan/mysql-4.1
2005-04-19 13:59:09 +03:00
mskold@mysql.com
d4b862f076
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-19 12:51:20 +02:00
mskold@mysql.com
4193a314fb
Fix for Bug #9691 UPDATE fails on attempt to update primary key
2005-04-19 11:21:26 +02:00
joreland@mysql.com
2df2c4b895
CSC5149 - ndb test programs
...
Fix src distributions for benchmark prg
2005-04-19 11:17:32 +02:00
lenz@mysql.com
f8bf8697c1
- removed COPYING from txt_files of Docs/Makefile.am
...
(it's already in EXTRA_DIST of the toplevel Makefile.am)
2005-04-19 11:15:36 +02:00
jan@hundin.mysql.fi
1f994ec920
Style change. Use 1 and 0 instead of true and false.
2005-04-19 08:23:03 +03:00
dlenev@mysql.com
49b4af7bf6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
2005-04-18 15:04:50 +04:00
joreland@mysql.com
f931466f36
bug#9892
...
Make BUILDINDX RF_LOCAL aware
2005-04-18 12:41:12 +02:00
dlenev@brandersnatch.localdomain
91c482e4a1
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg8086
2005-04-18 13:54:42 +04:00
jan@hundin.mysql.fi
384efc4493
Fixed a bug: deadlock without any locking, simple select and update (Bug #7975 ).
...
Backported from 5.0.3.
2005-04-18 12:17:32 +03:00
sergefp@mysql.com
a76ecc5bc7
Fix for BUG#9103:
...
Don't produce data truncation warnings from within cp_buffer_from_ref(). This function
is only used to make index search tuples and data truncation that occurs here has no
relation with truncated values being saved into tables.
2005-04-18 05:21:44 +04:00
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
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
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
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
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
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
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
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
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
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
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
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