brian@zim.(none)
d11ba2ca04
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zim.(none):/home/brian/mysql/mysql-5.0
2005-06-01 22:50:00 -07:00
brian@zim.(none)
113a99626d
Merge of 4.1->5.0. This contained the fixes for GCC 4.0
2005-06-01 21:56:30 -07:00
kent@mysql.com
f0fcc54b0c
Merge
2005-06-02 04:45:09 +02:00
brian@zim.(none)
efb5ed5bab
Merge
2005-06-01 18:48:29 -07:00
jimw@mysql.com
b884660a83
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-01 18:10:02 -07:00
jimw@mysql.com
1c387c8f71
Restore a bit of code accidently deleted during merge
2005-06-01 18:08:39 -07:00
kent@mysql.com
f889f0884c
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-06-02 02:57:18 +02:00
kent@mysql.com
bd48eed988
tztime.cc:
...
Set #pragma implementation" earlier
Many files:
Need to include <my_global.h> before #ifdef USE_PRAGMA_IMPLEMENTATION
2005-06-02 02:43:32 +02:00
brian@zim.(none)
ba9b9f8993
Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed a number of dumb things in ha_tina.
2005-06-01 17:34:10 -07:00
jimw@mysql.com
ed18369236
Fix --with-bdb to be --with-berkeley-db in BUILD/SETUP.sh
2005-06-01 16:16:25 -07:00
jimw@mysql.com
8b0daa8445
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-01 16:13:25 -07:00
jimw@mysql.com
5a271e2c12
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-01 16:13:24 -07:00
tomas@poseidon.ndb.mysql.com
a60bdadb31
Bug #11019 mgmapi start backup in some cases returns wrong backupid
2005-06-02 01:13:23 +02:00
jimw@mysql.com
f5f88703b2
Fix compile error when HAVE_BERKELEY_DB
2005-06-01 16:03:41 -07:00
jimw@mysql.com
fb51d6eca5
Update results of test after merge of bugfix
2005-06-01 14:35:02 -07:00
jimw@mysql.com
d4be534815
Merge mysql.com:/home/jimw/my/mysql-4.1-8572
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:03:13 -07:00
jimw@mysql.com
b8f3c515ba
Merge mysql.com:/home/jimw/my/mysql-4.1-9660
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:02:26 -07:00
jimw@mysql.com
4f6db49795
Merge mysql.com:/home/jimw/my/mysql-4.1-10944
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 13:00:32 -07:00
jimw@mysql.com
0a2d95e983
Merge mysql.com:/home/jimw/my/mysql-4.1-8135
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 12:59:11 -07:00
serg@serg.mylan
0c69fe8428
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-01 20:04:53 +02:00
jimw@mysql.com
7ac7bfc3c8
Fix handling of NULL fields in FIELD(). (Bug #10944 )
2005-06-01 09:48:25 -07:00
serg@serg.mylan
34df99ab82
more than 64 indexes per table. bugfixes. bug#10995
2005-06-01 18:33:16 +02:00
lenz@mysql.com
00a303a0fb
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-06-01 17:43:37 +02:00
lenz@mysql.com
cef84f3b40
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/my/mysql-5.0
2005-06-01 17:41:28 +02:00
mronstrom@mysql.com
e6f01bf647
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/mikron/bug10837
2005-06-01 17:40:00 +02:00
mronstrom@mysql.com
5b54fcab6a
Renamed bugs.test to default.test
...
Moved enabling of warnings to ensure that no warnings are generated
when this test case is executed on a clone where InnoDB is not
activated. This would fail the test case in those clones otherwise.
2005-06-01 17:36:21 +02:00
pem@mysql.com
f711a3d7c1
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2005-06-01 15:50:52 +02:00
pem@mysql.comhem.se
5afef58364
Fixed BUG#10969: Stored procedures: crash if default() function
...
Return an error if default() is used on a local variable.
This is actaully a side-effect of BUG#5967: Stored procedure declared
variable used instead of column (to be fixed later), so this is really a
workaround until that is fixed.
2005-06-01 15:42:40 +02:00
monty@mysql.com
a69f432115
Code cleanups during code reviews
...
Ensure we get error if INSERT IGNORE ... SELECT fails
Fixed wrong key_part->key_length usage in index_merge
2005-06-01 16:35:09 +03:00
ingo@mysql.com
122079759a
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-06-01 15:25:13 +02:00
lenz@mysql.com
9afd2563e9
Merge of 4.1 -> 5.0
2005-06-01 15:11:14 +02:00
ingo@mysql.com
b28a44e999
Bug#10602 - LOAD INDEX INTO CACHE deadlocks
...
Fixed two deadlocks.
Made minor changes.
2005-06-01 14:20:16 +02:00
ramil@mysql.com
086d81207b
A fix (bug #10568 : Function 'LAST_DAY(date)' does not return NULL for invalid argument).
2005-06-01 17:09:46 +05:00
svoj@mysql.com
340bb46324
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-01 16:32:00 +05:00
ingo@mysql.com
4a25417394
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
After merge fixes.
2005-06-01 13:22:17 +02:00
joreland@mysql.com
7e031804e4
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-01 13:07:47 +02:00
lenz@mysql.com
e877e71b17
Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
2005-06-01 13:06:15 +02:00
joreland@mysql.com
61638019a3
ndb - fix broken ndb_alter_table
...
reinit AI len after preparing interpreted
2005-06-01 13:05:41 +02:00
lenz@mysql.com
7bd3dd7cb3
- removed references to some obsolete files (BUG#10824)
...
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
spec file)
2005-06-01 12:59:10 +02:00
svoj@mysql.com
83d0ac6f25
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-01 15:51:03 +05:00
lenz@mysql.com
92cffda595
Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2005-06-01 12:24:00 +02:00
pem@mysql.comhem.se
85f19d5da5
Fixed BUG#10961: Stored procedures: crash if select * from dual
...
Have to catch errors from SELECT when opening a cursor.
2005-06-01 12:18:41 +02:00
mskold@mysql.com
e8613e53b9
Fixed handling of condition pushdown to storage engine of NO BETWEEN and NOT IN
2005-06-01 11:56:47 +02:00
ingo@mysql.com
0a1e38b7ed
Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statement.
...
Manual merge from 4.1.
2005-06-01 11:15:21 +02:00
serg@serg.mylan
f72841b4ed
Merge bk-internal:/home/bk/mysql-5.0
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-01 09:35:35 +02:00
serg@serg.mylan
6e37d8c15d
FIELD_TYPE_NEWDECIMAL is numeric too
2005-06-01 09:32:05 +02:00
ramil@mysql.com
1061c412ba
merging: the patch rejected as the code differs much; should be rewritten for 5.0.
2005-06-01 11:10:30 +05:00
joreland@mysql.com
bdd0f5f823
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-01 07:59:48 +02:00
petr@mysql.com
c7581758ec
fix IM to display version string in "show instance status" (Bug #10229 )
2005-06-01 04:40:22 +04:00
tim@siva.hindu.god
6077a08aab
Merge bk-internal:/home/bk/mysql-5.0
...
into siva.hindu.god:/opt/home/tim/m/50/a
2005-06-01 11:43:15 +12:00