msvensson@neptunus.(none)
18bda1aff2
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-05-29 13:11:21 +02:00
kroki@mysql.com
e87bc6e48c
Avoid race between master and slave.
2006-05-29 14:45:20 +04:00
msvensson@devsrv-b.mysql.com
126bce1d16
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/mysql-5.0
...
into devsrv-b.mysql.com:/users/msvensson/mysql-5.0
2006-05-29 10:47:08 +02:00
msvensson@neptunus.(none)
31765bfbf9
Merge 192.168.0.20:mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 10:45:29 +02:00
msvensson@neptunus.(none)
f90fe21064
Merge bk-internal:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 10:43:15 +02:00
msvensson@shellback.(none)
c2e8f34eb4
Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
...
into shellback.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 10:05:52 +02:00
msvensson@devsrv-b.mysql.com
1e89dff375
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/users/msvensson/mysql-5.0
2006-05-29 09:35:18 +02:00
ramil@mysql.com
8436973fda
after merge fix.
2006-05-29 12:32:08 +05:00
msvensson@neptunus.(none)
c58f79cb3e
Update result file after merge
2006-05-29 09:26:31 +02:00
msvensson@neptunus.(none)
91e4fd9ac9
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-29 09:06:06 +02:00
ramil@mysql.com
6b2ab800c9
manual merge
2006-05-29 11:17:38 +05:00
ramil@mysql.com
120c72b047
Merge mysql.com:/usr/home/ram/work/mysql-4.1
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2006-05-29 08:55:48 +05:00
igor@rurik.mysql.com
cb4c6a0ded
Merge rurik.mysql.com:/home/igor/mysql-4.1
...
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-05-28 14:23:28 -07:00
aelkin@mysql.com
6119b7136e
BUG#14157: utf8 encoding in binlog without set character_set_client
...
refining the test case to exclude problems with koi8r on some platforms.
2006-05-28 19:47:01 +03:00
igor@rurik.mysql.com
377b3e0306
Fixed bug #17873 : confusing error message when IGNORE/USE/FORCE INDEX
...
refers to a column name.
Added a new error message ER_INDEX_DOES_NOT_EXIST.
2006-05-27 23:57:33 -07:00
kent@mysql.com
d0ed239bba
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
2006-05-27 18:09:50 +02:00
pekka@mysql.com
f9d9cc1575
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/space/pekka/ndb/version/my50
2006-05-27 05:03:47 +02: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
kent@mysql.com
51f3882243
Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
...
into mysql.com:/data0/mysqldev/my/mysql-5.0
2006-05-26 18:38:34 +02:00
kent@mysql.com
f5a443d283
Merge mysql.com:/data0/mysqldev/my/mysql-4.1.20-release
...
into mysql.com:/data0/mysqldev/my/mysql-4.1
2006-05-26 18:31:25 +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
gkodinov@mysql.com
b6acee915a
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18681
2006-05-26 11:57:56 +03:00
gkodinov@mysql.com
7552d8d9ba
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18681
2006-05-26 11:51:30 +03:00
gkodinov@mysql.com
f0f9c740ed
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B14875
2006-05-26 11:51:11 +03:00
gkodinov@mysql.com
59837f7a5b
Bug #14875 : Bad view DEFINER makes SHOW CREATE VIEW fail
...
When reading a view definition from a .frm file it was
throwing a SQL error if the DEFINER user is not defined.
Changed it to a warning to match the (documented) case
when a view with undefined DEFINER user is created.
2006-05-26 11:49:39 +03:00
gkodinov@mysql.com
a21a2b5bcd
BUG#18681: View privileges are broken
...
The check for view security was lacking several points :
1. Check with the right set of permissions : for each table ref that
participates in a view there were the right credentials to use in it's
security_ctx member, but these weren't used for checking the credentials.
This makes hard enforcing the SQL SECURITY DEFINER|INVOKER property
consistently.
2. Because of the above the security checking for views was just ruled out
in explicit ways in several places.
3. The security was checked only for the columns of the tables that are
brought into the query from a view. So if there is no column reference
outside of the view definition it was not detecting the lack of access to
the tables in the view in SQL SECURITY INVOKER mode.
The fix below tries to fix the above 3 points.
2006-05-26 11:47:53 +03:00
pekka@mysql.com
00cbeb84ec
ndb - minor fix to unhandled error, already in 5.1 [ auto-incr ]
2006-05-25 21:27:56 +02:00
acurtis@xiphis.org
6d285f8a29
updated libtool/autoconf files
2006-05-25 11:36:29 -07:00
pekka@mysql.com
6ff1648d99
ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ]
2006-05-25 18:00:55 +02:00
pekka@mysql.com
61057f6112
Merge mysql.com:/space/pekka/ndb/version/my50
...
into mysql.com:/space/pekka/ndb/version/my50-bug14509
2006-05-25 13:14:16 +02:00
pekka@mysql.com
da807a85b9
Merge mysql.com:/space/pekka/ndb/version/my50
...
into mysql.com:/space/pekka/ndb/version/my50-bug14509
2006-05-25 13:08:50 +02:00
ramil@mysql.com
bbb991e597
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/home/ram/work/4.1.b16900
2006-05-25 16:05:55 +05:00
gkodinov@mysql.com
0336a34c7f
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kgeorge/mysql/5.0/clean
2006-05-25 13:12:57 +03:00
gkodinov@mysql.com
d50fcc8644
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18742-2
2006-05-25 12:21:42 +03:00
gkodinov@mysql.com
bda18671a1
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B18742-2
2006-05-25 10:45:24 +03:00
gkodinov@mysql.com
486837b0fa
Merge mysql.com:/home/kgeorge/mysql/5.0/clean
...
into mysql.com:/home/kgeorge/mysql/5.0/B19700
2006-05-25 10:45:00 +03:00
gkodinov@mysql.com
d6b5a89044
Bug #19700 : subselect returning BIGINT always returned it as SIGNED
...
The unsigned flag in Item was not propagated through the single value subqueries.
This caused the result to be treated as signed.
2006-05-25 10:39:18 +03:00
aelkin@dl145h.mysql.com
ac158d52b9
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into dl145h.mysql.com:/tmp/andrei/4.1-bug14157-utf8_binlog_testcases
2006-05-24 16:55:04 +02:00
monty@mysql.com
4064f11acf
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-05-24 17:33:12 +03:00
monty@mysql.com
7cb3df0114
Merge monty@192.168.0.9:/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2006-05-24 17:32:17 +03:00
monty@mysql.com
9e9ca8b6eb
More DBUG statements
...
Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait()
The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads.
This fixes:
Bug#16986: Deadlock condition with MyISAM tables
Bug#20048: FLUSH TABLES WITH READ LOCK causes a deadlock
2006-05-24 17:21:35 +03:00
svoj@april.(none)
99b1d746b3
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
2006-05-24 18:42:18 +05:00
iggy@mysql.com
3cc64cef9a
BUG#18669: Session COM_STATISTICS breaks mysqladmin status.
...
Changed COM_STATISTICS to display the global status, instead of thead status, for slow queries and table opens.
2006-05-24 09:34:36 -04:00
elliot@mysql.com
15f763af84
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.0-bug19394
2006-05-24 09:02:55 -04:00
serg@mysql.com
c00edb8e8a
Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
...
into mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
2006-05-24 14:22:36 +02:00
serg@mysql.com
44ec4456b8
Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release
...
into mysql.com:/data0/mysqldev/my/mysql-4.1.20-release
2006-05-24 14:12:19 +02:00
svoj@april.(none)
551043b3df
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
2006-05-24 16:59:27 +05:00
konstantin@mysql.com
9e635c7bfe
Merge mysql.com:/opt/local/work/mysql-5.0-root
...
into mysql.com:/opt/local/work/mysql-5.0-runtime
2006-05-24 14:54:35 +04:00
ramil@production.mysql.com
cc1dc76c66
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
2006-05-24 12:31:49 +02:00
kent@mysql.com
7ffc786686
configure.in:
...
Update NDB version as well
2006-05-24 12:30:34 +02:00