database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-13 21:42:58 +03:00
Code Activity
38,069 Commits 3,273 Branches 1,096 Tags
fe0cfacf35514b6a271d5be99e16ca18bea08715
Commit Graph

13917 Commits

Author SHA1 Message Date
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
igor@olga.mysql.com
8b7fc77a0f Added a test case with views for bug #17526. 2006-07-19 16:42:19 -07:00
iggy@rolltop.ignatz42.dyndns.org
36296d1bc9 Manual merge required. 2006-07-19 17:39:53 -04:00
iggy@rolltop.ignatz42.dyndns.org
2835ebdf63 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_bug20328
 2006-07-19 17:00:39 -04:00
igor@olga.mysql.com
d1c109ef12 Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-19 13:44:37 -07:00
igor@olga.mysql.com
f201828dd8 Fixed bug #17526: incorrect print method 
for class Item_func_trim. 
For 4.1 it caused wrong output for EXPLAIN EXTENDED commands
if expressions with the TRIM function of two arguments were used.
For 5.0 it caused an error message when trying to select
from a view with the TRIM function of two arguments.
This unexpected error message was due to the fact that the
print method for the class Item_func_trim was inherited from
the class Item_func. Yet the TRIM function does not take a list
of its arguments. Rather it takes the arguments in the form:
  [{BOTH | LEADING | TRAILING} [remstr] FROM] str) |
  [remstr FROM] str
 2006-07-19 12:36:55 -07: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
iggy@rolltop.ignatz42.dyndns.org
79483c22bb Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_bug16180
 2006-07-19 13:09:11 -04:00
tnurnberg@salvation.intern.azundris.com
56e1d96122 manual merge, part 2/2 2006-07-19 16:50:55 +02:00
msvensson@neptunus.(none)
a9572e07e9 Update 'abort_not_supported_test' to print a reason why the test was aborted 
and use it in mysql-test-run.pl
Use standard defines as last argument to 'fn_format'
 2006-07-19 14:25:52 +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
msvensson@neptunus.(none)
685a932ea3 Remove code in mysqltest that requires the no longer existing "manager" 
Remove the four test cases that require manager
 2006-07-19 10:38:43 +02:00
msvensson@neptunus.(none)
fe40a8cf9d Merge bk-internal:/home/bk/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-07-19 08:57:52 +02:00
sergefp@pylon.mylan
dd3434b302 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/home/psergey/mysql-5.1-bug20484-push
 2006-07-19 05:43:23 +04: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
jimw@rama.(none)
78a2b9420c Merge bk-internal:/home/bk/mysql-5.0-kt 
into  rama.(none):/home/jimw/my/mysql-5.0-12673
 2006-07-18 09:43:23 -07:00
gluh@mysql.com/vva.(none)
7c0930c4ae after merge fix 2006-07-18 20:13:13 +05:00
gluh@myoffice.izhnet.ru
f76aec6d90 Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge 
into  myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1
 2006-07-18 18:43:55 +05:00
mikael/pappa@dator5.(none)
4b71f42dd3 BUG#20340: NODEGROUP in information_schema.partitions integer => 
error in error log when "default is put into it
NODEGROUP string to cater for "default" in it
 2006-07-18 09:33:40 -04:00
msvensson@neptunus.(none)
601d948099 Fix erroneous join function use 2006-07-18 15:15:43 +02:00
msvensson@neptunus.(none)
da214608b4 Add verbose printouts for im_start and im_stop 2006-07-18 14:53:50 +02: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
igor@rurik.mysql.com
3d83d5aa03 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-17 13:24:43 -07:00
jimw@rama.(none)
9f308f676a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-18539
 2006-07-17 12:21:30 -07:00
igor@olga.mysql.com
59e7a26177 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-17 11:41:27 -07:00
andrey@lmy004.
0404763d81 WL#3337 (Events new architecture) 
Small updates before patch submit.
 2006-07-17 16:52:45 +02:00
evgen@moonbone.local
b0b1fe3bd8 select.result, select.test: 
Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.
 2006-07-17 16:12:42 +04:00
kroki/tomash@moonlight.intranet
ed2d8cce57 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21013
 2006-07-17 15:17:18 +04:00
mikael/pappa@dator5.(none)
bae61f209d Fixed test case 2006-07-17 06:53:46 -04:00
kroki/tomash@moonlight.intranet
5a64e5c24f Bug#21013: Performance Degrades when importing data that uses Trigger 
and Stored Procedure

The essence of the bug was that for every re-execution of stored
routine or prepared statement new items for character set conversions
were created, thus increasing the number of items and the time of their
processing, and creating memory leak.

No test case is provided since current test suite can't cover such type
of bugs.
 2006-07-17 14:48:40 +04:00
mikael/pappa@dator5.(none)
6019ac9b71 Fixes for strange appearance of db.opt file 2006-07-17 06:41:12 -04:00
evgen@moonbone.local
51a636293e mysql.test, mysql.result: 
Corrected the test case after fixing bug#10977
 2006-07-17 14:22:21 +04:00
igor@rurik.mysql.com
21469f84ac Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-07-16 12:10:46 -07:00
mikael/pappa@dator5.(none)
3d44231064 Minor fix 2006-07-15 17:05:47 -04:00
evgen@moonbone.local
f1346cf8f6 Fixed bug#10977: No warning issued if a column name is truncated 
When an alias is set to a column leading spaces are removed from the alias.
But when this is done on aliases set by user this can lead to confusion.

Now Item::set_name() method issues the warning if leading spaces were removed
from an alias set by user.

New warning message is added.
 2006-07-16 00:45:38 +04:00
mikael/pappa@dator5.(none)
1c1a131675 Remove files that tests leave behind 2006-07-15 12:01:46 -04:00