Commit graph

35289 commits

Author SHA1 Message Date
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
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
gkodinov/kgeorge@magare.gmz
360b063d3f Correctly recognize Intel Core2Duo Extreme
in build.
2007-03-01 15:28:10 +02: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
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
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
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
rafal@quant.(none)
dc6e9d7fc3 Merge quant.(none):/ext/mysql/bkroot/mysql-5.0-rpl
into  quant.(none):/ext/mysql/bk/mysql-5.0-rpl-warnings
2007-03-01 08:47:49 +01:00
rafal@quant.(none)
8aee1f6e89 Fixes of compilation warnings and errors. 2007-03-01 08:41:13 +01:00
bar@mysql.com
08d2203077 Additional fix for bug N 15126
Replacing local directory.
2007-03-01 11:23:12 +04:00
tomas@poseidon.mysql.com
3cd7b7da7f Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-01 08:37:16 +07:00
tomas@poseidon.mysql.com
6dd7294dfb ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer
ndb - 5.1.16 uint64 align for ndb_restore
(backport)
2007-03-01 08:34:59 +07:00
tomas@poseidon.mysql.com
7fae701374 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-01 08:20:43 +07:00
tsmith@quadxeon.mysql.com
380e2de10a Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
2007-03-01 01:59:31 +01:00
tsmith@quadxeon.mysql.com
b99c49421b Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/40
2007-03-01 01:58:31 +01:00
kent@mysql.com/kent-amd64.(none)
47efc7527d Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-02-28 22:33:29 +01:00
kent@mysql.com/kent-amd64.(none)
904972ceee Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-02-28 22:31:58 +01:00
kent@mysql.com/kent-amd64.(none)
4bddd1f6ca Makefile.am:
EXCEPTIONS-CLIENT is now static part of repository
2007-02-28 22:30:50 +01:00
lars/lthalmann@mysql.com/dl145k.mysql.com
12e9464b5a Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
2007-02-28 22:30:40 +01:00
kent@mysql.com/kent-amd64.(none)
de51325735 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-02-28 22:14:45 +01:00
kent@mysql.com/kent-amd64.(none)
444072f299 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-02-28 22:13:35 +01:00
kent@mysql.com/kent-amd64.(none)
f471a67fa6 Makefile.am:
EXCEPTIONS-CLIENT is now static part of repository
EXCEPTIONS-CLIENT:
  BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT
2007-02-28 22:09:09 +01:00
jani@ua141d10.elisa.omakaista.fi
bcbc0031eb Fixed compiler warnings. 2007-02-28 22:23:35 +02:00
msvensson@pilot.blaudden
ab61d07a30 Merge pilot.blaudden:/home/msvensson/mysql/bug25074/my50-bug25074
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 21:21:37 +01:00
kent@mysql.com/kent-amd64.(none)
9a48ef3a06 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-02-28 21:20:57 +01:00
kent@mysql.com/kent-amd64.(none)
1fad124e01 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-02-28 21:19:19 +01:00
msvensson@pilot.blaudden
cc7e77c5fd Bug #25074 mysql_upgrade test can't give consistent results
- Tell the programs executed by mysql_upgrade to only read
  from the defaults file generated by msyql_upgrade
 - Fix memory leaks
2007-02-28 21:05:39 +01:00
msvensson@pilot.blaudden
0b4598a4b3 Bug #20166 mysql-test-run.pl does not test system privilege tables creation
- No .sql files in mysql-test/lib/ anymore, don't copy them
2007-02-28 20:44:49 +01:00
msvensson@pilot.blaudden
3648941ecc Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 16:45:41 +01:00
msvensson@pilot.blaudden
6fac51be9f Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint-bug20166
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 16:40:03 +01:00
msvensson@pilot.blaudden
b0ab925389 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-02-28 16:39:26 +01:00
msvensson@pilot.blaudden
b6fd729beb Merge pilot.blaudden:/home/msvensson/mysql/bug24878/my41-bug24878
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
2007-02-28 16:38:31 +01:00
msvensson@pilot.blaudden
6ca22c6672 Bug#24878 mysql server doesn't log incident time in "mysqld got signal 11" error messages
- Add printout of current time when mysqld is killed by an
   unhandled signal
2007-02-28 16:37:50 +01:00
bar@mysql.com
3c3964359d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  mysql.com:/home/bar/mysql-5.0.b24478
2007-02-28 18:21:00 +04:00