Commit graph

8914 commits

Author SHA1 Message Date
tnurnberg@mysql.com/salvation.intern.azundris.com
35c523a6f8 Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view
"A SELECT privilege on a view is required for SHOW CREATE VIEW and it will stay
that way because of compatibility reasons." (see #20136)

a test case to illustrate how the ACLs work in this case (and ensure they will continue
to do so in the future)
2006-08-03 14:58:13 +02:00
msvensson@neptunus.(none)
502498ed7b Disable test case for for bug 21042 2006-08-02 08:46:58 +02:00
msvensson@neptunus.(none)
31be565d2e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-08-01 20:24:30 +02:00
igreenhoe@maint1.mysql.com
ff3a640e8f Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  maint1.mysql.com:/data/localhome/igreenhoe/mysql-5.0-maint
2006-08-01 13:04:48 +02:00
msvensson@neptunus.(none)
e9b624df99 Change error code to test for "unknown error" with to 10000 2006-08-01 11:29:10 +02:00
igreenhoe/greenman@anubis.greendragongames.com
d97a344e7a Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-5.0-maint
2006-07-31 13:04:01 -07:00
msvensson@neptunus.(none)
2461e48698 Bug#21042 mysql client segfaults on importing a mysqldump export
- Use strmake, that will both protect the buffer and make sure it's terminated by a zero
 - Add test case
2006-07-31 14:22:32 +02:00
msvensson@neptunus.(none)
d8a5ea2621 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-31 13:12:49 +02:00
msvensson@neptunus.(none)
823ead0775 perror returns 2 if it does not understand the option --ndb
Move that perror test to ndb_basic so it's only run when there is support for --ndb
2006-07-31 13:11:21 +02:00
igreenhoe/greenman@anubis.greendragongames.com
61a3a8e95c Fix for bug #16226 (timestamp_diff truncation issue when requesting
difference between timestamp in values of months and quarters.)

Problem:  when requesting timestamp diff in months or quarters, it
would only examine the date (and not the time) for the comparison.

Solution:  increased precision of comparison.
2006-07-28 20:51:17 -07:00
tsmith@maint1.mysql.com
28df542a7a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  maint1.mysql.com:/data/localhome/tsmith/bk/global-50
2006-07-28 17:40:33 +02:00
jimw@rama.(none)
e4d32625ca Merge bk-internal:/home/bk/mysql-5.0-maint
into  rama.(none):/home/jimw/my/mysql-5.0-19498
2006-07-27 11:42:34 -07:00
kroki/tomash@moonlight.intranet
053c9af65b Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main
2006-07-27 13:47:36 +04:00
tsmith/tim@siva.hindu.god
80465ab6af Merge siva.hindu.god:/usr/home/tim/m/bk/global-41
into  siva.hindu.god:/usr/home/tim/m/bk/global-50
2006-07-26 13:30:03 -06:00
msvensson@neptunus.(none)
10f3b6aa9f Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug20145
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-26 14:22:23 +02:00
msvensson@neptunus.(none)
7e8cfe3830 Update test result for perror 2006-07-26 14:21:40 +02:00
msvensson@neptunus.(none)
2bb5f5662f Bug#19890 mysqltest: "query" command is broken
- Allow "query" to be used as a prefix for focing a command to be sent to server
 - Add testcases
2006-07-26 14:02:24 +02:00
msvensson@neptunus.(none)
8f21e375a2 Bug #19265 describe command does not work from mysql prompt
- Add test case
2006-07-24 19:01:54 +02:00
msvensson@neptunus.(none)
839e87d115 Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug20145
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-24 18:21:15 +02:00
msvensson@neptunus.(none)
bbf6c985c8 Bug#20145 perror segfault when call it with error nr
- Add test case(execute perror)
  - Check if strerror has returned NULL and set msg to "Unknown Error" in that case
  - Thanks to Steven Xie for pointing out how to fix.
2006-07-24 18:05:00 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
2c36a11d08 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b19370
2006-07-23 16:26:12 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
6955f87be4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b19370
2006-07-23 15:45:00 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a03dcf3f47 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b8143
2006-07-23 15:28:50 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
1c04310e30 Fix for bug #8143: A date with value 0 is treated as a NULL value 2006-07-23 15:25:30 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
694d4999ef Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/ram/work/4.1.b16327
2006-07-23 14:17:01 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
41ba943964 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b19370
2006-07-23 13:43:44 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a810a2a437 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/5.0.b10966
2006-07-23 12:58:26 +05:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
95197805e2 Merge bk://anubis/mysql-5.0-engines
into  xiphis.org:/home/antony/work2/merge/mysql-5.0
2006-07-21 10:14:25 -07:00
tsmith@maint1.mysql.com
539ac78df2 Merge patch for bug #15195 from 5.0 -> 5.0-release (for 5.0.24) 2006-07-21 09:53:12 +02:00
msvensson@neptunus.(none)
cb23cd759e Merge neptunus.(none):/home/msvensson/mysql/bug7498/my50-bug7498
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-20 13:41:50 +02:00
tsmith/tim@siva.hindu.god
17cc8acc91 Partial merge of the patch for bug #15195 from 4.1 -> 5.0; more changes needed 2006-07-20 00:45:47 -06:00
kostja@bodhi.local
f22a4ce1a1 A fix and a test case for Bug#21002 "Derived table not selecting from a
"real" table fails in JOINs".

This is a regression caused by the fix for Bug 18444. 
This fix removed the assignment of empty_c_string to table->db performed 
in add_table_to_list, as neither me nor anyone else knew what it was 
there for. Now we know it and it's covered with tests: the only case 
when a table database name can be empty is when the table is a derived 
table. The fix puts the assignment back but makes it a bit more explicit.

Additionally, finally drop sp.result.orig which was checked in by mistake.
2006-07-19 22:33:19 +04:00
tnurnberg@salvation.intern.azundris.com
36bf00709e Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0
2006-07-19 19:52:27 +02:00
tnurnberg@salvation.intern.azundris.com
56e1d96122 manual merge, part 2/2 2006-07-19 16:50:55 +02:00
tnurnberg@salvation.intern.azundris.com
199bb148fd Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0-release
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge
2006-07-19 14:12:30 +02:00
tnurnberg@salvation.intern.azundris.com
b304cb6da8 Bug#20989: View '(null).(null)' references invalid table(s)... on SQL SECURITY INVOKER
REPLACE ... SELECT would require INSERT privileges on certain tables
when SELECT really suffices. Require INSERT only on target table.
2006-07-19 11:49:07 +02:00
patg@govinda.patg.net
71f5b4997a "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
Post merge changes.
2006-07-18 18:41:36 -07:00
patg@govinda.patg.net
259f9bb0d7 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0-bug18764.2
2006-07-18 17:21:50 -07:00
jimw@rama.(none)
d18eacc71d Bug #19498: Inconsistent support for DEFAULT in TEXT columns
When a default of '' was specified for TEXT/BLOB columns, the specification
  was silently ignored. This is presumably to be nice to applications (or
  people) who generate their column definitions in a not-very-clever fashion.

  For clarity, doing this now results in a warning, or an error in strict
  mode.
2006-07-18 16:04:18 -07:00
evgen@moonbone.local
b7a55b9b5c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-07-18 23:45:17 +04:00
evgen@moonbone.local
6dd8772bfc Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-07-18 23:30:09 +04:00
jimw@rama.(none)
0bdb8fcd0b Merge bk-internal:/home/bk/mysql-5.0-maint
into  rama.(none):/home/jimw/my/mysql-5.0-17903
2006-07-18 10:58:44 -07:00
evgen@moonbone.local
ed8eb31412 Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
into  moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-07-18 21:32:25 +04:00
evgen@moonbone.local
a8d230c672 Merge moonbone.local:/work/mysql-4.1
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-07-18 21:30:26 +04:00
jimw@rama.(none)
8b91a02728 Merge bk-internal:/home/bk/mysql-5.0-engines
into  rama.(none):/home/jimw/my/mysql-5.0-17608
2006-07-18 10:25:04 -07:00
msvensson@neptunus.(none)
2d43d0675e Bug#18539 uncompress(d) is null: impossible?
- Add a check that length of field to uncompress is longer than 4 bytes.
   This can be dones as the length of uncompressed data is written as 
   first four bytes of field and thus it can't be valid compressed data.
2006-07-18 12:41:41 +02:00
msvensson@neptunus.(none)
ec183566cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-07-18 09:50:46 +02:00
patg@govinda.patg.net
51d8bcf627 "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
Removed logic in ha_federated::write_row, which checks field query ids in the
loop which builds the query to run on the remote server.
2006-07-17 16:45:04 -07:00
igor@rurik.mysql.com
31a7bdfcf6 Post-merge fix. 2006-07-17 15:28:24 -07:00
iggy@rolltop.ignatz42.dyndns.org
ad12809f35 Bug# 20221- Dumping of multiple databases containing view(s) yields maleformed dumps. 2006-07-17 18:07:08 -04:00