Commit graph

34912 commits

Author SHA1 Message Date
serg@sergbook.mysql.com
4accfd2968 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
2006-05-31 15:07:29 +02:00
mskold@mysql.com
48a568cef6 Removed dead code that had been commented out 2006-05-31 15:07:11 +02:00
mskold@mysql.com
4532eb14e3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/marty/MySQL/mysql-5.1-new
2006-05-31 14:38:20 +02:00
tnurnberg@mysql.com
4dc848752d Bug#18235: assertion/crash when windows mysqld is ended with ctrl-c
Two threads both try a shutdown sequence which creates a race to the
de-init/free of certain resources.

This exists in similar form in the client as 17926: "mysql.exe crashes
when ctrl-c is pressed in windows."
2006-05-31 14:27:31 +02:00
jani@ua141d10.elisa.omakaista.fi
04441d04b1 Merge from 5.0 to 5.1. Third part with fixes. 2006-05-31 14:55:28 +03:00
jani@ua141d10.elisa.omakaista.fi
a0a7573e02 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new-marvel
2006-05-31 14:18:12 +03:00
aelkin@dl145k.mysql.com
e9570047a4 BUG#14157: utf8 encoding in binlog without set character_set_client
missed table to drop after merge from 4.1
2006-05-31 12:51:21 +02:00
jonas@perch.ndb.mysql.com
11b72ef4eb ndb -
print some in case of error
2006-05-31 11:57:35 +02:00
aelkin@dl145k.mysql.com
87c935fe48 Merge dl145k.mysql.com:/tmp/andrei/MERGE/mysql-4.1
into  dl145k.mysql.com:/tmp/andrei/MERGE/5.0
2006-05-31 10:47:16 +02:00
msvensson@shellback.(none)
abf422cd0e Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-05-31 10:33:38 +02:00
serg@sergbook.mysql.com
a1b9c3a1ed proper cleanup after the test 2006-05-31 10:30:48 +02:00
mskold@mysql.com
c11887c49b Bug #16997 Table rename that changes database does not rename indexes: Moved index tables to system database 2006-05-31 10:28:42 +02:00
ingo@mysql.com
e4f12577a6 Merge mysql.com:/home/mydev/mysql-5.0-bug19604
into  mysql.com:/home/mydev/mysql-5.1-bug19604
2006-05-31 10:27:53 +02:00
ingo@mysql.com
6345502b53 Bug#19604 - CHECK TABLE with concurrent INSERT can reset auto_increment
CHECK TABLE did temporarily clear the auto_increment value.
It runs with a read lock, allowing other readers and
conurrent INSERTs. The latter could grab the wrong value
in this moment.

CHECK TABLE does no longer modify the auto_increment value.
Not even for a short moment.
2006-05-31 10:22:44 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9bf4fd5e9b Merge from 5.0 2006-05-31 11:18:58 +03:00
gbichot@dl145j.mysql.com
5b33d510a4 Merge gbichot@bk-internal:/home/bk/mysql-5.1-new
into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new
2006-05-31 09:02:02 +02:00
serg@serg.mylan
543e1d7b11 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-05-31 08:55:05 +02:00
jonas@perch.ndb.mysql.com
9c20aa944d ndb -
fix return value of "testBasic -n InsertError2 T1"
2006-05-31 08:22:54 +02:00
jonas@perch.ndb.mysql.com
8e0567e8ad ndb -
fix testNodeRestart -n Bug18612 when running with only 1 node group
2006-05-31 08:18:27 +02:00
tomas@poseidon.ndb.mysql.com
df507201b2 ndb: release LOCK_open during mysqld schema sync and mysqld sync with binlog (create/drop/rename table)
+ increase timeout for sync... which now should never occur
2006-05-31 01:52:14 +02:00
ngrishakin@mysql.com
0774b37d2b disabled.def with ndb_dd_backuprestore test disabled 2006-05-30 23:21:44 +02:00
pekka@mysql.com
bc889160b1 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50
2006-05-30 22:54:06 +02:00
serg@serg.mylan
1753cadb42 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-05-30 20:11:56 +02:00
serg@serg.mylan
c250645c6e don't try to "estimate" a number of words that a plugin parser can produce 2006-05-30 20:06:29 +02:00
serg@sergbook.mysql.com
7135b559ab Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
2006-05-30 18:24:06 +02:00
serg@sergbook.mysql.com
9eb15a0e8f sql/Makefile.am: better mysqld dependencies
sql/discover.cc:    close(-1) bug
sql/slave.cc:       DBUG_ENTER/RETURN tags
ha_archive.cc:      double-close bug
2006-05-30 18:21:03 +02:00
serg@serg.mylan
b214937fde reduce error log spamming by old privilege tables. If they're old,
report it once, don't whine about every missing column.
2006-05-30 18:18:13 +02:00
serg@serg.mylan
32711e7b00 Now ftparser does not need to bother about memory management -
it can tell MySQL to make a copy of everything (bug#17123)
2006-05-30 18:15:18 +02:00
gbichot@dl145j.mysql.com
2367ca4675 Merge gbichot@bk-internal:/home/bk/mysql-5.1-new
into  dl145j.mysql.com:/users/gbichot/mysql-5.1-new
2006-05-30 16:21:51 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c81b4c01bf Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2006-05-30 16:07:49 +03:00
iggy@mysql.com
433c57d997 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/mnt/storeage/mysql-5.0-maint_bug18669
2006-05-30 08:22:12 -04:00
elliot@mysql.com
1a7ad4e45d Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
2006-05-30 07:57:12 -04:00
tomas@poseidon.ndb.mysql.com
faff1b37a5 Bug #20142 show engine ndb status may falsely return latest epoch == 0 2006-05-30 13:55:25 +02:00
mskold@mysql.com
f838e8a499 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-4.1
2006-05-30 13:20:38 +02:00
ramil@mysql.com
d402c3d4a3 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/mysql-5.0
2006-05-30 14:47:07 +05:00
anozdrin@mysql.com
11fcbaf1e1 Merge mysql.com:/home/alik/MySQL/devel/5.0-rt
into  mysql.com:/home/alik/MySQL/devel/5.0-tree
2006-05-30 13:22:49 +04:00
andrey@lmy004.
1edd2cf833 update show authors 2006-05-30 10:22:31 +02:00
ramil@mysql.com
4df24774c1 Merge mysql.com:/usr/home/ram/work/mysql-4.1
into  mysql.com:/usr/home/ram/work/mysql-5.0
2006-05-30 13:16:11 +05:00
igor@rurik.mysql.com
1504abcdd5 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into  rurik.mysql.com:/home/igor/mysql-4.1
2006-05-30 00:17:50 -07:00
igor@rurik.mysql.com
6051e0f959 Fixed bug #17873: confusing error message when IGNORE/USE/FORCE INDEX
refers to a column name.
2006-05-30 00:08:58 -07:00
gluh@eagle.intranet.mysql.r18.ru
ae72df07f2 Bug#17204 "second CALL to procedure crashes Server"
Bug#18282 "INFORMATION_SCHEMA.TABLES provides inconsistent info about invalid views"
This bug caused crashes or resulted in wrong data being returned
when one tried to obtain information from I_S tables about views
using stored functions.

It was caused by the fact that we were using LEX representing
statement which were doing select from I_S tables as active LEX
when contents of I_S table were built. So state of this LEX both
affected and was affected by open_tables() calls which happened
during this process. This resulted in wrong behavior and in
violations of some of invariants which caused crashes.

This fix tries to solve this problem by properly saving/resetting
and restoring part of LEX which affects and is affected by the
process of opening tables and views in get_all_tables() routine.
To simplify things we separated this part of LEX in a new class
and made LEX its descendant.
2006-05-30 10:45:23 +05:00
pekka@mysql.com
7f46e03f55 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/space/pekka/ndb/version/my50
2006-05-30 05:05:30 +02:00
ngrishakin@mysql.com
89afd0225b Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
2006-05-30 01:37:20 +02:00
ngrishakin@mysql.com
0763f5e7b4 removed partitions from ndb_dd_backuprestore test 2006-05-30 01:36:35 +02:00
petr@mysql.com
67d3675549 update show authors 2006-05-30 03:26:58 +04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
7dae459d70 BUG#17310: Archive error for drop database 2006-05-29 14:51:46 -04:00
kent@mysql.com
3cf1f85d35 Merge 2006-05-29 20:25:30 +02:00
andrey@lmy004.
35b6416fcf Merge lmy004.:/work/mysql-5.1-new-vanilla
into lmy004.:/work/mysql-5.1-runtime
2006-05-29 20:23:44 +02:00
kent@mysql.com
4f2e784ac2 make_win_src_distribution.sh:
Convert to DOS EOL if dsp/dsw is in package
2006-05-29 20:09:22 +02:00
kent@mysql.com
8719abf753 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-05-29 19:17:55 +02:00