tomas@poseidon.mysql.com
60ab46bd87
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-03-02 09:13:00 +07:00
tomas@poseidon.mysql.com
4fed7eb88e
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-02 09:10:17 +07:00
tomas@poseidon.mysql.com
f106c25765
Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
...
(part 1)
- add signal data
- add ref in dict on create/drop table/index
2007-03-02 09:06:05 +07:00
tomas@poseidon.mysql.com
fa47c63b91
Bug #26720 Infinite loop on unknown signal in logging function
...
- terminate printing
2007-03-02 08:56:22 +07:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
e1a90408db
bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected,
...
add a new file in 5.0 and rename it in 5.1 because the directory of ndb is changed from 5.0 to 5.1
2007-03-02 09:41:47 +08:00
malff/marcsql@weblab.(none)
cb1cba9e77
Missing parameter to DBUG_PRINT
2007-03-01 18:14:51 -07:00
kent@kent-amd64.(none)
675e76851b
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-02 00:56:59 +01:00
kent@mysql.com/kent-amd64.(none)
7062e5cc75
mysql.sln:
...
Correction of embedded build types
2007-03-02 00:54:02 +01:00
malff/marcsql@weblab.(none)
86c6eb7089
Fixed compiler warnings
2007-03-01 16:39:00 -07:00
kent@kent-amd64.(none)
22288586fd
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-02 00:00:55 +01:00
kent@mysql.com/kent-amd64.(none)
1a6c9f9767
mysql.sln:
...
Disabled build of all embedded server libraries, "libmysqld.ldd"
"mysqldemb.lib" and "mysqlserver.lib"
2007-03-01 23:48:22 +01:00
malff/marcsql@weblab.(none)
0e0655a792
Manual merge of 5.0 into 5.0-runtime
2007-03-01 15:10:14 -07:00
evgen@moonbone.local
44f97f3f50
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/25122-bug-5.0-opt-mysql
2007-03-02 00:10:25 +03:00
evgen@moonbone.local
11588e5e4a
Bug#25122: Views based on a self-joined table aren't insertable.
...
When INSERT is done over a view the table being inserted into is
checked to be unique among all views tables. But if the view contains
self-joined table an error will be thrown even if all tables are used under
different aliases.
The unique_table() function now also checks tables' aliases when needed.
2007-03-02 00:09:22 +03:00
malff/marcsql@weblab.(none)
df5c5aea23
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
2007-03-01 14:06:57 -07:00
malff/marcsql@weblab.(none)
e46083c9cf
Manual merge of 5.1 into 5.1-runtime
2007-03-01 13:47:28 -07:00
msvensson@pilot.blaudden
75ab386731
After merge fixes
2007-03-01 20:59:08 +01:00
msvensson@pilot.blaudden
d1d64ba50f
Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 19:10:07 +01:00
msvensson@pilot.blaudden
c0fdf1792a
Add two more USE_CYGWIN ifdefs to mysqltest
2007-03-01 19:09:43 +01:00
msvensson@pilot.blaudden
86625d711f
Fix bug in mtr.pl where slave wes using same query log file as master
2007-03-01 18:31:09 +01:00
msvensson@pilot.blaudden
c58b2bd757
Don't set the "is_windows" flag if using cygwin
2007-03-01 18:30:29 +01:00
msvensson@pilot.blaudden
f5778fc73e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 18:12:56 +01:00
rafal@quant.(none)
ffc6c262a0
Merge rsomla@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl
2007-03-01 16:32:57 +01:00
lars/lthalmann@mysql.com/dl145k.mysql.com
e71dbbd54e
Post-merge fix
2007-03-01 16:17:48 +01:00
lars/lthalmann@dl145k.mysql.com
17d00e3c6b
Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rpl
...
into mysql.com:/nfsdisk1/lars/bk/mysql-5.1-new-rpl
2007-03-01 15:39:57 +01:00
msvensson@pilot.blaudden
4367b151c2
Switch back to master before cleanup of the created tables
...
That causes test case for bug#6880 to be run on the master
instead of the slave and thus the result files need to be updated
2007-03-01 15:25:42 +01:00
bar@mysql.com
8bbb520891
After merge fix
2007-03-01 18:16:17 +04:00
msvensson@pilot.blaudden
51a71fb667
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-01 14:53:32 +01:00
gkodinov/kgeorge@magare.gmz
360b063d3f
Correctly recognize Intel Core2Duo Extreme
...
in build.
2007-03-01 15:28:10 +02:00
msvensson@pilot.blaudden
6b4a71659e
Make sure tests drops objects created and restore variables to default
2007-03-01 14:16:38 +01:00
malff/marcsql@weblab.(none)
14e1ed367e
Merge weblab.(none):/home/marcsql/TREE/mysql-4.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-4.1-runtime
2007-03-01 05:59:16 -07:00
joerg@trift2.
df9c7a0fdc
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into trift2.:/MySQL/M51/push-5.1
2007-03-01 13:48:35 +01:00
bar@mysql.com
90c6b836de
after merge fix
2007-03-01 16:08:13 +04:00
bar@mysql.com
20d2f414c5
Merge mysql.com:/home/bar/mysql-5.0.merge
...
into mysql.com:/home/bar/mysql-5.1-rpl
2007-03-01 16:06:29 +04:00
bar@mysql.com
7cb75013c1
Merge mysql.com:/home/bar/mysql-5.0.rafal
...
into mysql.com:/home/bar/mysql-5.1-rpl
2007-03-01 15:14:49 +04:00
rafal@quant.(none)
00e6bf6e73
Fixing manual merge error.
2007-03-01 11:52:20 +01:00
msvensson@pilot.blaudden
c506169c06
Merge bk-internal:/home/bk/mysql-4.1-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-03-01 11:41:53 +01:00
msvensson@pilot.blaudden
c1f8e7f913
MySQL versions before 5.0 still use cygwin, no need
...
to convert path
2007-03-01 11:41:29 +01:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2f5a2b2476
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-03-01 11:37:28 +01:00
rafal@quant.(none)
c0e985cd58
Merge quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings
...
into quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
2007-03-01 10:58:13 +01:00
jamppa@bk-internal.mysql.com
87e7afe541
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
2007-03-01 10:47:30 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
2dc3fbf925
Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj
...
into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj
2007-03-01 17:43:14 +08:00
rafal@quant.(none)
536d857d95
Removing two more compilation warnings.
2007-03-01 10:40:48 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
a934e46ebd
Fixed compiler warnings.
2007-03-01 11:28:33 +02:00
rafal@quant.(none)
9c950bca95
Merge quant.(none):/ext/mysql/bk/mysql-5.0-bug25306
...
into quant.(none):/ext/mysql/bkroot/mysql-5.1-new-rpl
2007-03-01 10:03:42 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
ff5376986f
Disabled compiler warnings.
2007-03-01 10:52:25 +02:00
bar@mysql.com
c75a0d6a17
Fix for wrong replace command.
2007-03-01 12:26:07 +04:00
rafal@quant.(none)
7825a45e1c
Merge quant.(none):/ext/mysql/bk/mysql-5.0-bug25463
...
into quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
2007-03-01 09:23:26 +01:00
rafal@quant.(none)
d127882641
Merge quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings
...
into quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
2007-03-01 09:21:32 +01:00
bar@mysql.com
272446dfcd
Renaming recenly added test case, because of name conflict
...
when merging into 5.1.
2007-03-01 11:52:25 +04:00
