bell@sanja.is.com.ua
364c53101d
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.1
2006-06-01 23:25:23 +03:00
bell@sanja.is.com.ua
60b738b62b
interface for transaction log management added to handlerton
...
iterators creation interface added to handlerton
2006-06-01 21:47:15 +03:00
jani@ua141d10.elisa.omakaista.fi
dea377fafc
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-06-01 20:39:12 +03:00
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
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
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
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
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
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
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
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
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
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
andrey@lmy004.
1edd2cf833
update show authors
2006-05-30 10:22:31 +02: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
petr@mysql.com
67d3675549
update show authors
2006-05-30 03:26:58 +04: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
msvensson@neptunus.(none)
10719727ff
Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-29 15:43:00 +02:00
msvensson@neptunus.(none)
e7375bd438
Merge bk-internal:/home/bk/mysql-5.1-new
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-05-29 15:32:52 +02:00
andrey@lmy004.
ea20259aac
Merge lmy004.:/work/mysql-5.1-new-vanilla
...
into lmy004.:/work/mysql-5.1-runtime
2006-05-29 15:16:07 +02:00
andrey@lmy004.
c9309583ee
local variable interval to interval_tmp because it hides
...
Event_timed::interval
2006-05-29 13:12:34 +02:00
andrey@lmy004.
b4752351f2
Fix for bug #17394 - Events namespace is wrong
2006-05-29 10:39:45 +02:00
serg@serg.mylan
60e3b61786
Incompatible ftparser plugin API change.
...
mysql_parse() and mysql_add_word() now take a MYSQL_FTPARSER_PARAM*,
not a mysql_ftparam.
2006-05-28 17:02:50 +02:00
serg@sergbook.mysql.com
71657322fd
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1
2006-05-28 14:54:28 +02:00
serg@sergbook.mysql.com
fe97dbb587
handlerton cleanup:
...
duplicate fields removed, st_mysql_storage_engine added to support
run-time handlerton initialization (no compiler warnings), handler API
is now tied to MySQL version, handlerton->plugin mapping added
(slot-based), dummy default_hton removed, plugin-type-specific
initialization generalized, built-in plugins are now initialized too,
--default-storage-engine no longer needs a list of storage engines
in handle_options().
mysql-test-run.pl bugfixes
2006-05-28 14:51:01 +02:00
vtkachenko@vadima.volia.com
2e6b51579b
Merge vtkachenko@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into vadima.volia.com:/root/mysql-5.1-new1
2006-05-27 08:08:03 +03:00
vtkachenko@vadima.volia.com
ddc463494b
sql_class.cc, mysql_priv.h:
...
Added accessor to handler data.
2006-05-27 08:05:39 +03:00
elliot@mysql.com
47f7438333
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/emurphy/iggy/mysql-5.0
2006-05-26 15:00:09 -04:00
rburnett@bk-internal.mysql.com
f4aa434fbe
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-26 15:08:24 +02:00
kent@mysql.com
7175805cd4
Merge mysql.com:/data0/mysqldev/my/mysql-5.1-release
...
into mysql.com:/data0/mysqldev/my/mysql-5.1-new
2006-05-26 13:17:09 +02:00
gkodinov@mysql.com
393d1b69e0
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kgeorge/mysql/5.0/clean
2006-05-26 12:13:48 +03:00