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
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
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
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
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
6f686a9ba0
Merge mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-release
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
2006-05-26 17:18:20 -04:00
elliot@mysql.com
9ab5929eba
BUG#15868 InnoDB thread thrashing
...
Restoring default innodb_thread_concurrency to 8
This default now matches 5.0
2006-05-26 17:11:21 -04:00
elliot@mysql.com
8be9f0c1e7
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1-new
2006-05-26 16:12:05 -04:00
elliot@mysql.com
708f63d624
Set the Windows README file to EOLN_NATIVE so that it doesn't look
...
horrible when checked out on Windows.
2006-05-26 16:09:39 -04: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
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
jmiller@mysql.com
0bf4f53187
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
2006-05-25 22:37:06 +02:00
jmiller@mysql.com
115bcca2d1
Removing ./r/rpl_ndb_dd_partitions.result & ./t/rpl_ndb_dd_partitions.test since NDB only will support key partitions and moving them to the test-extra tree for safe keeping
2006-05-25 22:36:03 +02: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
65f21e216b
ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ] v5.1
2006-05-25 20:00:36 +02:00
pekka@mysql.com
6ff1648d99
ndb - compile fix for Solaris 10 AMD64 -max GCC [ ulonglong != Uint64 ]
2006-05-25 18:00:55 +02:00
rburnett@bk-internal.mysql.com
61bd780166
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
2006-05-25 17:47:26 +02:00
pekka@mysql.com
e929e28c7b
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/space/pekka/ndb/version/my51
2006-05-25 16:20:36 +02:00
gluh@eagle.intranet.mysql.r18.ru
31a54240e7
test fix
2006-05-25 19:20:35 +05:00
pekka@mysql.com
ae964cb4cc
Merge mysql.com:/space/pekka/ndb/version/my51
...
into mysql.com:/space/pekka/ndb/version/my51-bug14509
2006-05-25 16:20:34 +02:00
gluh@mysql.com
023317d68a
after merge fix
2006-05-25 19:20:34 +05:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
7f6afa8b2a
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
2006-05-25 10:20:33 -04: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
serg@serg.mylan
9874a76252
fix for BSD make
2006-05-25 12:48:31 +02:00
pekka@mysql.com
7fcc77f49c
ndb - bug#14509 v5.1 part 2/2 : handler level
2006-05-25 12:13:47 +02: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
pekka@mysql.com
577246509f
ndb - bug#14509 v5.1 part 1/2 : ndb api level [requires part 2/2]
2006-05-25 12:03:02 +02: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
reggie@big_geek.
e056a96a29
The previous patch fixed the csv engine to support dos, linux, and mac line endings. The patch, however, had
...
a problem when the table only has a single record in it. This patch corrects that.
ha_tina.cc:
Fix problem with previous patch when there is only one record in the table
2006-05-24 15:41:12 -05:00
evgen@moonbone.local
d7e831ac62
sql_select.cc:
...
After merge fix
2006-05-25 00:03:35 +04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
701007fe30
review fix
2006-05-24 15:01:03 -04:00