mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
5e634e7d88
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-06-01 13:39:11 -04:00
jani@ua141d10.elisa.omakaista.fi
b5158f252d
In prepare_view_securety_context() the sql_command came in wrong.
...
If the first part was SHOW and second part SELECT, it would have
thought that the command was SELECT, although the first part of
it was SHOW. It would then fail later.
Thus we need to set thd->lex to old_lex (first part) here before going
in to prepare_security().
2006-06-01 16:26:16 +03:00
svoj@may.pils.ru
77ab3b28a7
BUG#19192 - CHECK TABLE EXTENDED / REPAIR TABLE show no errors.
...
ALTER TABLE crashes
Executing fast alter table (one that doesn't need to copy data)
on tables created by mysql versions prior to 4.0.25 could result
in posterior server crash when accessing these tables.
There was a bug prior to mysql-4.0.25. Number of null fields was
calculated incorrectly. As a result frm and data files gets out of
sync after fast alter table. There is no way to determine by which
mysql version (in 4.0 and 4.1 branches) table was created, thus we
disable fast alter table for all tables created by mysql versions
prior to 5.0 branch.
See BUG#6236.
2006-06-01 18:08:57 +05:00
tomas@poseidon.ndb.mysql.com
eed7775dff
Bug #18483 Cannot create table with FK constraint
...
- remove error set for auto partitioned tables
2006-06-01 14:51:58 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
19ef4bd6f6
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-06-01 07:23:08 -04:00
msvensson@shellback.(none)
6044b5a1f2
Merge shellback.(none):/home/msvensson/mysql/mysql-5.0
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-06-01 12:33:52 +02:00
anjuta@arthur.local
5459ebc572
Fixed Bug#19479:mysqldump creates invalid dump.
...
Only check for FN_DEVCHAR in filenames if FN_DEVCHAR is defined.
This allows to use table names with ":" on non windows platforms.
On Windows platform get an error if you use table name that contains FN_DEVCHAR
2006-06-01 12:34:44 +03:00
tomas@poseidon.ndb.mysql.com
3ab132bdeb
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-01 08:46:23 +02:00
mskold@mysql.com
fbe1319c28
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-01 08:43:47 +02:00
igor@rurik.mysql.com
d350bd9050
Post-merge fixes
2006-05-31 22:55:45 -07:00
igor@rurik.mysql.com
0585e50599
Merge rurik.mysql.com:/home/igor/tmp_merge
...
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-05-31 18:10:02 -07:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
31665cb561
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-05-31 18:24:34 -04:00
tomas@poseidon.ndb.mysql.com
586f00b279
Bug #18947 CRBR: order in binlog of create table and insert (on different table) not determ
...
- move clear of slock until after completion of data events on the binlog
2006-05-31 23:24:25 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
f1337d3ef1
Merge c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20161
...
into c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-05-31 14:07:43 -04:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
02b3293592
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
2006-05-31 13:51:01 -04:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
fbd7a258e2
BUG#18198: Many strange partition functions were allowed, now only strictly allowed functions are ok
2006-05-31 13:32:14 -04:00
serg@serg.mylan
3679f433d4
correct type for federated_db_init()
2006-05-31 19:12:17 +02:00
serg@serg.mylan
5d5b9fedfe
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
2006-05-31 18:49:12 +02:00
serg@serg.mylan
d976a5d558
classes that are compiled conditionally in log_event.cc must be defined conditionally in log_event.h
2006-05-31 18:37:16 +02:00
serg@sergbook.mysql.com
2e16f1eccc
after review fixes
2006-05-31 18:07:32 +02:00
msvensson@shellback.(none)
c542aa8701
Merge shellback.(none):/home/msvensson/mysql/bug19575/my50-bug19575
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-05-31 16:32:08 +02:00
msvensson@shellback.(none)
20217ba36f
Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
...
- Include prefix files that renames all public functions in yaSSLs
OpenSSL API to ya<function_name>. They will otherwise conflict
with OpenSSL functions if loaded by an application that uses OpenSSL
as well as libmysqlclient with yaSSL support.
2006-05-31 16:19:06 +02:00
mskold@mysql.com
07189b3845
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into mysql.com:/home/marty/MySQL/mysql-5.1-new
2006-05-31 16:16:04 +02:00
tomas@poseidon.ndb.mysql.com
b6f54a737a
Bug #18947 CRBR: order in binlog of create table and insert (on different table) not determ
...
- wait for schema event also if mysqld is a single one in cluster to ensure serialization with data events
+ some current_thd removals
+ enabling kill of sql thread during shema sync wait
2006-05-31 16:16:03 +02:00
mikael@c-3d08e253.1238-1-64736c10.cust.bredbandsbolaget.se
9686e7bfc9
BUG#20161: LINEAR keyword on subpartitions not displayed in information schema for partitions
...
and in SHOW CREATE TABLE
2006-05-31 09:33:10 -04:00
mskold@mysql.com
8cd139c27a
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/marty/MySQL/mysql-5.0
2006-05-31 15:32:49 +02:00
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
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
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
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
jani@a193-229-222-105.elisa-laajakaista.fi
9bf4fd5e9b
Merge from 5.0
2006-05-31 11:18:58 +03:00
acurtis@xiphis.org
0cd7ac833a
Bug#19648
...
"Merge table does not work with bit types"
MERGE should have HA_CAN_BIT_FIELD feature bit set or else table row is
formatted incorrectly.
2006-05-30 17:10:53 -07: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
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
evgen@moonbone.local
fdc2b921cc
item_cmpfunc.cc, func_in.result, multi_update.result:
...
After merge fix
2006-05-30 23:05:34 +04: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@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
evgen@moonbone.local
de96d52999
Manually merged
2006-05-30 19:16:30 +04:00
evgen@moonbone.local
de8a1b4f19
Merge moonbone.local:/work/18630-bug-4.1-mysql
...
into moonbone.local:/work/18360-bug-4.1-mysql-opt
2006-05-30 18:57:08 +04: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
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
andrey@lmy004.
1edd2cf833
update show authors
2006-05-30 10:22:31 +02: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