mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity
37,733 commits 3,591 branches 380 tags 1.7 GiB
Commit graph

11,141 commits

Author SHA1 Message Date
jimw@rama.(none)
abc148000d Bug #21288: mysqldump segmentation fault when using --where 
The problem was that the error handling was using a too-small buffer to
  print the error message generated. We fix this by not using a buffer at
  all, but by using fprintf() directly. There were also some problems with
  the error handling in table dumping that was exposed by this fix that were
  also corrected.
 2006-08-17 14:09:24 -07:00
rburnett@bk-internal.mysql.com
4b7e3775be Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-17 22:30:32 +02:00
jonas@perch.ndb.mysql.com
560fc3e3b3 Merge perch.ndb.mysql.com:/home/jonas/src/51-clean 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-17 19:49:00 +02:00
tnurnberg@salvation.intern.azundris.com
d7cbdfaa3d Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51 
into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
 2006-08-17 18:39:30 +02:00
cmiller@zippy.cornsilk.net
e65a3e97b5 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1-new-maint
 2006-08-17 12:38:30 -04:00
cmiller@zippy.cornsilk.net
c821fa8bc6 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-17 12:17:52 -04:00
rburnett@bk-internal.mysql.com
d65095b451 Merge bk-internal.mysql.com:/data0/bk/tmp_reg 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1
 2006-08-17 17:19:41 +02:00
cmiller@zippy.cornsilk.net
64092ca93b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:55:57 -04:00
evgen@moonbone.local
270629a158 ndb_condition_pushdown.result: 
Corrected test case result after fix for bug#18165
view.result, view.test:
  Corrected test case for bug#21261
 2006-08-17 18:50:53 +04:00
cmiller@zippy.cornsilk.net
030ddb48f3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:47:23 -04:00
cmiller@zippy.cornsilk.net
c627a6ce84 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:42:50 -04:00
rburnett@bk-internal.mysql.com
1bfe766869 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-17 16:37:16 +02:00
tnurnberg@maint1.mysql.com
781658d64b Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  maint1.mysql.com:/data/localhome/tnurnberg/mysql-5.1-maint-i51
 2006-08-17 16:15:09 +02:00
mikael/pappa@dator5.(none)
ddbdc16a21 Merge dator5.(none):/home/pappa/bug21350 
into  dator5.(none):/home/pappa/bug21388
 2006-08-17 09:32:13 -04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
907f5db856 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b20695
 2006-08-17 11:36:03 +05:00
pgalbraith/patg@govinda.patg.net
dd1d46c2cd merge warning test results (!) 2006-08-16 20:39:33 -07:00
pgalbraith/patg@govinda.patg.net
ceb7cb55e7 test result changes (non-functional) for 5.1-5.0 merge 2006-08-16 17:16:36 -07:00
iggy@rolltop.ignatz42.dyndns.org
00ab7be7b9 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
 2006-08-16 19:31:33 -04:00
tnurnberg@salvation.intern.azundris.com
4550b9d044 manual merge 2006-08-16 23:45:01 +02:00
iggy@rolltop.ignatz42.dyndns.org
ca6532af50 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
 2006-08-16 16:16:10 -04:00
tnurnberg@salvation.intern.azundris.com
2c16439d02 Merge tnurnberg@maint1:/data/localhome/tnurnberg/i51 
into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51
 2006-08-16 21:34:20 +02:00
mikael/pappa@dator5.(none)
b738fd4db8 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 
into  dator5.(none):/home/pappa/bug21388
 2006-08-16 14:46:30 -04:00
iggy@rolltop.ignatz42.dyndns.org
a86f035a08 Bug#20328 - Correction to test/result for broken Windows build. 2006-08-16 13:55:16 -04:00
igor@rurik.mysql.com
cabb55a64f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
 2006-08-16 10:21:23 -07:00
patg@govinda.patg.net
b56ff54805 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
 2006-08-16 10:05:24 -07:00
patg@govinda.patg.net
79ad722e39 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
 2006-08-16 10:03:24 -07:00
igor@rurik.mysql.com
067d6fdfca Fixed bug #18165. 
Made [NOT]BETWEEN predicates SARGable in respect to the second and 
the third arguments.
 2006-08-16 09:37:19 -07:00
msvensson@shellback.(none)
da60a5194c Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-16 17:14:40 +02:00
msvensson@shellback.(none)
496a04ccfa Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328 
into  shellback.(none):/home/msvensson/mysql/bug20328/my51-bug20328
 2006-08-16 17:05:43 +02:00
msvensson@shellback.(none)
98eaa07600 Bug#20328 mysql client: dumb about trailing spaces on 'help' command 
Fix testcase to also work on windows
 2006-08-16 17:03:41 +02:00
mikael/pappa@dator5.(none)
a6df8abf2c Merge dator5.(none):/home/pappa/bug21143 
into  dator5.(none):/home/pappa/bug21388
 2006-08-16 10:53:20 -04:00
mikael/pappa@dator5.(none)
8d8b2b38df Merge dator5.(none):/home/pappa/bug21173 
into  dator5.(none):/home/pappa/bug21388
 2006-08-16 10:47:13 -04:00
mikael/pappa@dator5.(none)
142af8c26f Merge dator5.(none):/home/pappa/bug15890 
into  dator5.(none):/home/pappa/bug21388
 2006-08-16 10:41:17 -04:00
mikael/pappa@dator5.(none)
9ba77eb876 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug21388
 2006-08-16 10:36:01 -04:00
evgen@sunlight.local
db17048cac Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  sunlight.local:/local_work/21261-bug-5.0-mysql
 2006-08-16 18:17:58 +04:00
rburnett@bk-internal.mysql.com
8baecf7ed6 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-16 16:04:10 +02:00
rburnett@bk-internal.mysql.com
f23643cc54 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-16 15:58:25 +02:00
msvensson@shellback.(none)
b963293595 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-16 15:50:50 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
39860d67de Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b9509
 2006-08-16 12:42:22 +05:00
holyfoot/hf@mysql.com/deer.(none)
c965eea789 Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.20910
 2006-08-16 09:57:05 +05:00
ramil/rkalimullin@production.mysql.com
4ef5116425 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
 2006-08-16 06:37:39 +02:00
bar@mysql.com/bar.intranet.mysql.r18.ru
b1f9b63a54 Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b9509
 2006-08-16 09:31:24 +05:00
brian@zim.(none)
8d83366bac Merge zim.(none):/home/brian/mysql/dep-5.1 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-15 13:53:13 -07:00
evgen@moonbone.local
9b10c3a0fc Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/work/15950-bug-5.0-opt-mysql
 2006-08-15 21:48:07 +04:00
evgen@sunlight.local
dd9a07706b Fixed bug#21261: Wrong access rights was required for an insert into a view 
SELECT right instead of INSERT right was required for an insert into to a view.
This wrong behaviour appeared after the fix for bug #20989. Its intention was
to ask only SELECT right for all tables except the very first for a complex
INSERT query. But that patch has done it in a wrong way and lead to asking 
a wrong access right for an insert into a view.

The setup_tables_and_check_access() function now accepts two want_access
parameters. One will be used for the first table and the second for other
tables.
 2006-08-15 21:45:24 +04:00
cmiller@maint1.mysql.com
a90dd98bd1 Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.0-maint
 2006-08-15 19:34:53 +02:00
cmiller@maint1.mysql.com
686074f077 Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my51-bug20908 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-5.1-new-maint
 2006-08-15 19:33:51 +02:00
sergefp@mysql.com
7c73d0b2d6 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-opt-bug21282-r2
 2006-08-15 21:32:09 +04:00
cmiller@maint1.mysql.com
bebdc62840 Merge maint1.mysql.com:/data/localhome/cmiller/bug20908/my50-bug20908 
into  maint1.mysql.com:/data/localhome/cmiller/bug20908/my51-bug20908
 2006-08-15 19:30:24 +02:00
sergefp@mysql.com
f68d8cf994 BUG#21077: 4.1->5.0 merge 2006-08-15 21:16:02 +04:00