monty@mysql.com
3ca23bd918
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-26 21:09:42 +03:00
monty@mysql.com
220a01a838
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2005-04-26 16:03:20 +03:00
jimw@mysql.com
93ff028f9d
Fix compile issues in Intel C/C++ compiler (Bug #9063 )
2005-04-25 18:02:03 -07:00
dlenev@mysql.com
71c7c0d341
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-bg10040
2005-04-25 11:26:20 +04:00
dlenev@brandersnatch.localdomain
a4a4c5cb69
Fix for func_sapdb failures on 64-bit platforms (aka Bug #10040
...
"'func_sapdb' fails on 64bit build hosts")
2005-04-25 11:25:40 +04:00
mskold@mysql.com
c27c54f49d
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-22 17:41:06 +02:00
mskold@mysql.com
9457551616
Fix for Bug #9318 drop database does not drop ndb tables
2005-04-22 15:28:23 +02:00
ingo@mysql.com
0e7f6a601f
Bug#7806 - insert on duplicate key and auto-update of timestamp
...
A fix of the original patch.
Correctly clear a bit from an enum value.
2005-04-22 12:30:09 +02:00
msvensson@neptunus.(none)
0c23f81dcb
C99 Portability fix
2005-04-21 21:47:58 +02:00
mskold@mysql.com
29f8460e7b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 13:10:05 +02:00
mskold@mysql.com
ad9fba9f38
Fix for failing ps_7ndb.test, force write_row when batching inserts so that update of primary key is done before next value to insert
2005-04-21 13:09:19 +02:00
lenz@mysql.com
f9a44aa249
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-04-21 10:27:37 +02:00
mskold@mysql.com
e0fe3e75c7
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 09:27:20 +02:00
lenz@mysql.com
03fccad9b4
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-04-21 09:08:09 +02:00
igor@rurik.mysql.com
20250dc497
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-04-20 15:08:22 -07:00
lenz@mysql.com
7ca62cc674
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-04-20 20:44:18 +02:00
ingo@mysql.com
8faed37945
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-bug7806
2005-04-20 12:24:22 +02:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
jimw@mysql.com
6632ed5ce7
Check that the default storage engine is really available, and
...
refuse to start up if it is not. (Bug #9815 )
2005-04-13 18:25:31 -07:00
jimw@mysql.com
47ab7c8785
Don't allow the server to start up when an invalid user is
...
specified via --user or in configuration. (Bug #9833 )
2005-04-13 15:43:29 -07:00
heikki@hundin.mysql.fi
b698b8620e
ha_innodb.cc:
...
Fix part of bug #9670 : if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE
2005-04-13 20:21:28 +03:00