dlenev@mockturtle.local
631d3c9c1f
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-25 14:58:45 +03:00
dlenev@mockturtle.local
86f36eb089
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
2007-01-24 19:26:06 +03:00
monty@narttu.mysql.fi
7df1dbcd74
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2007-01-22 19:18:22 +02:00
monty@mysql.com/narttu.mysql.fi
2dcc7110c9
Give warnings for unused objects
...
Changed error message to be compatible with old error file
Added new error message for new DUP_ENTRY syntax
2007-01-22 18:42:52 +02:00
dlenev@mockturtle.local
83bcfa2541
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg25044
...
into mockturtle.local:/home/dlenev/src/mysql-5.1-bg25044
2007-01-19 23:23:45 +03:00
dlenev@mockturtle.local
7b1a94ef78
Fix for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires global 'opening
...
tables' lock."
Execution of ALTER TABLE ... ENABLE KEYS on a table (which can take rather
long time) prevented concurrent execution of all statements using tables.
The problem was caused by the fact that we were holding LOCK_open mutex
during whole duration of this statement and particularly during call
to handler::enable_indexes(). This behavior was introduced as part of the
fix for bug 14262 "SP: DROP PROCEDURE|VIEW (maybe more) write to binlog
too late (race cond)"
The patch simply restores old behavior. Note that we can safely do this as
this operation takes exclusive lock (similar to name-lock) which blocks both
DML and DDL on the table being altered.
It also introduces mysql-test/include/wait_show_pattern.inc helper script
which is used to make test-case for this bug robust enough.
2007-01-19 23:15:59 +03:00
kroki/tomash@moonlight.home
68a4db3503
BUG#25211: events_bugs.test fails on sapsrv1
...
The problem was that the events_bugs test could randomly fail due to
races in the test case.
The solution is to replace fixed sleeps with reliable polling of a
certain state to settle. For that, a new auxiliary script
include/wait_condition.inc is used, that allows waiting for a given
query to return true.
2007-01-19 18:33:48 +03:00
tsmith@siva.hindu.god
6b729ff2cd
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:30:39 -07:00
tsmith@siva.hindu.god
cc7afe2494
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:30:35 -07:00
msvensson@neptunus.(none)
52a19378d8
Remove wait until not readonly
2007-01-16 09:38:09 +01:00
msvensson@neptunus.(none)
8540eac24a
Cset exclude: cmiller@221.54.57.10.in-addr.arpa.cmiller/221.54.57.10.in-addr.arpa|ChangeSet|20070111195403|30218
2007-01-15 21:50:31 +01:00
lars/lthalmann@dl145j.mysql.com
1e356251a0
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-12 12:31:44 +01:00
cmiller@221.54.57.10.in-addr.arpa.cmiller/221.54.57.10.in-addr.arpa
2706b3d737
Revert to old behavior. Including code to verify that a cluster is not
...
readonly seems like a good idea, but the test suite isn't expecting those
statements in some places.
Figure out how we want to use this code later.
2007-01-11 14:54:03 -05:00
cmiller@zippy.cornsilk.net
a16eaf3301
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
2007-01-07 09:31:49 -05:00
holyfoot/hf@hfmain.(none)
b4c0867df1
Merge mysql.com:/d2/hf/clean/my51-clean
...
into mysql.com:/d2/hf/common/my51-common
2006-12-31 12:41:42 +04:00
tsmith/tim@siva.hindu.god
0cb9cee7f4
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
2006-12-26 16:49:10 -07:00
acurtis/antony@ltamd64.xiphis.org
54133c7e38
Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
...
into xiphis.org:/home/antony/work2/mysql-5.1-engines-merge
2006-12-26 12:33:21 -08:00
svoj@june.mysql.com
838fe3a04e
Merge mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG25048/mysql-5.1-engines
2006-12-26 18:04:31 +04:00
tsmith/tim@siva.hindu.god
c5aa8fea82
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-12-22 13:43:48 -07:00
patg@radha.patg.net
2e538b4192
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into radha.patg.net:/Users/patg/mysql-build/mysql-5.1-arch-merge
2006-12-22 08:57:32 -05:00
msvensson@pilot.mysql.com
4563cb45f2
Add the missing file
2006-12-22 13:57:33 +01:00
msvensson@pilot.mysql.com
70b2f28f55
Wait for mysqld connected to NDB to come out of read only mode
2006-12-22 13:34:23 +01:00
tsmith/tim@siva.hindu.god
8075fc447e
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/51
2006-12-21 18:23:14 -07:00
tsmith/tim@siva.hindu.god
ab4c0f3b81
Merge siva.hindu.god:/usr/home/tim/m/bk/50-build
...
into siva.hindu.god:/usr/home/tim/m/bk/51-build
2006-12-20 15:46:36 -07:00
tsmith/tim@siva.hindu.god
0d5dc51438
Added innodb_rollback_on_timeout option to restore the 4.1
...
InnoDB timeout behavior (Bug #24200 )
2006-12-19 16:57:51 -07:00
msvensson@neptunus.(none)
82db3278aa
Add support for loading example plugin and add plugin.test
2006-12-15 00:09:56 +01:00
patg@radha.myhome.westell.com
b892f9adf8
WL #3031
...
* New result files due to new error message/error numbers
* Fixed system_mysql_db tests to work with servers table
* Added UTF8 charset to table defs
2006-12-11 11:44:03 -05:00
lars@black.(none)
d85ca0dc1d
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-12-08 23:41:29 +01:00
holyfoot/hf@deer.(none)
edfbcc12cb
Merge bk@192.168.21.1:mysql-5.1-opt
...
into mysql.com:/home/hf/work/embt/my51-embt
2006-12-08 15:49:43 +04:00
cbell/Chuck@suse.vabb.com
9f36c1c286
WL#3618 - Remove HAVE_ROW_BASED_REPLICATION from source code.
...
Please see worklog for details on files changed.
2006-12-07 09:18:35 -05:00
mskold/marty@mysql.com/linux.site
cde79e4f79
Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema
2006-12-01 15:49:07 +01:00
monty@mysql.com/nosik.monty.fi
93f246d4c1
Fixed portablity problem
...
Removed warnings from mysqltest scripts
2006-11-28 05:43:30 +02:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f
Fixed a LOT of compiler warnings
...
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
2006-11-27 01:47:38 +02:00
monty@nosik.monty.fi
89570bf966
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-22 14:11:36 +02:00
monty@nosik.monty.fi
38a92caeb7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-21 23:12:45 +02:00
monty@mysql.com/nosik.monty.fi
f6682e2743
Added --debug-info to most clients to detect memory leaks in mysql-test-run
...
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
2006-11-21 22:32:58 +02:00
monty@mysql.com/nosik.monty.fi
306b871d52
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-11-20 22:46:52 +02:00
monty@mysql.com/nosik.monty.fi
e825879800
Remove compiler warnings
...
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
holyfoot/hf@deer.(none)
385541131b
Merge mysql.com:/home/hf/work/embt/my50-embt
...
into mysql.com:/home/hf/work/embt/my51-embt
2006-11-13 20:16:46 +04:00
holyfoot/hf@mysql.com/deer.(none)
7ece4caad3
several fixes to make tests pass in embedded-server mode
2006-11-13 20:06:45 +04:00
lars@black.(none)
63c906f749
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-13 12:45:31 +01:00
lars@mysql.com/black.(none)
c5d56416ba
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-13 12:44:53 +01:00
df@kahlann.erinye.com
abd8eeaaa7
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
...
into kahlann.erinye.com:/home/df/mysql/build/51
2006-11-10 13:27:50 +01:00
df@kahlann.erinye.com
59e33edf22
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
...
into kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
2006-11-10 13:14:21 +01:00
df@kahlann.erinye.com
f1764fa99f
add --report-features to mysql-test-run.pl
2006-11-10 13:12:08 +01:00
lars/lthalmann@dl145h.mysql.com
3776e9622b
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-11-07 19:26:31 +01:00
anozdrin/alik@alik.
ee15c11b7c
Merge alik.:/mnt/raid/alik/MySQL/devel/5.1
...
into alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
2006-11-07 16:24:35 +03:00
lars/lthalmann@mysql.com/dl145h.mysql.com
aea1e14ef8
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
2006-11-07 12:02:53 +01:00
cmiller@zippy.cornsilk.net
b074e13483
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-11-02 17:51:59 -05:00
cmiller@zippy.cornsilk.net
af5acac047
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2006-11-02 17:39:52 -05:00