mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38032 commits 2779 branches 343 tags 1.6 GiB
Commit graph

17799 commits

Author SHA1 Message Date
mikael/pappa@dator5.(none)
35304be521 Merge dator5.(none):/home/pappa/clean-mysql-5.1-new-ndb 
into  dator5.(none):/home/pappa/push_clone
 2006-08-31 16:45:46 -04:00
brian@zim.(none)
422ab2973b Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zim.(none):/tmp/mysql-5.1-arch
 2006-08-31 13:42:46 -07:00
georg@lmy002.wdf.sap.corp
27636d9303 Additional files for cmake support 2006-08-31 19:52:42 +02:00
igor@rurik.mysql.com
ca3229dc1b Merge rurik.mysql.com:/home/igor/mysql-5.0-opt 
into  rurik.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug16249
 2006-08-31 08:58:26 -07:00
andrey@fifo.vaih.whnetz
f13daea150 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl3337 
into  fifo.vaih.whnetz:/work/mysql-5.1-wl3337-tree2
 2006-08-31 17:20:16 +02:00
andrey@fifo.vaih.whnetz
7b5916a26c WL#3337 (Event scheduler new architecture) 
This patch makes the relationship between Event_scheduler and Event_queue
unidirectional from the former to the latter.




The change is that the conditional on which the scheduler sleeped has been
moved to the Event_queue and the latter does not call anymore
Event_scheduler::queue_changed(), which in turn has be removed.
 2006-08-31 17:18:39 +02:00
igor@rurik.mysql.com
c0389e7b0c Fixed bug #16249: different results for a range with an without index 
when a range condition use an invalid DATETIME constant.
Now we do not use invalid DATETIME constants to form end keys for
range intervals: range analysis just ignores predicates with such
constants.
 2006-08-31 07:27:34 -07:00
msvensson@shellback.(none)
d463972da7 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-31 11:57:36 +02:00
jonas@perch.ndb.mysql.com
7fc7ef51e1 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
 2006-08-31 11:02:12 +02:00
mikael/pappa@dator5.(none)
5109531b61 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 
into  dator5.(none):/home/pappa/push_clone
 2006-08-31 04:56:09 -04:00
mikael/pappa@dator5.(none)
ba792224c4 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/push_clone
 2006-08-31 04:49:34 -04:00
gluh@mysql.com/gluh.(none)
acaef19c61 Bug#21862 Misleading error message 1490: "A PRIMARY KEY need to include all fields..." 
fixed error message
 2006-08-31 13:43:26 +05:00
msvensson@shellback.(none)
31df5d1d0d Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-08-31 10:33:35 +02:00
mikael/pappa@dator5.(none)
67ca3ba522 Merge dator5.(none):/home/pappa/clean-mysql-5.1-kt 
into  dator5.(none):/home/pappa/bug21388
 2006-08-31 04:26:14 -04:00
mikael/pappa@dator5.(none)
8c5db16fc5 Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug21388
 2006-08-31 04:21:14 -04:00
mikael/pappa@dator5.(none)
295d50b23d BUG#21658: Crash partition test in prepared statement protocol 
Review fixes
 2006-08-31 04:16:22 -04:00
evgen@moonbone.local
94028c618f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
 2006-08-31 12:14:27 +04:00
cmiller@zippy.cornsilk.net
d575196c35 Manual merge. 2006-08-30 21:26:43 -04:00
cmiller@zippy.cornsilk.net
f864c06e50 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-30 18:19:39 -04:00
tsmith@maint2.mysql.com
0af0180468 Merge maint2.mysql.com:/data/localhome/tsmith/bk/g50 
into  maint2.mysql.com:/data/localhome/tsmith/bk/50
 2006-08-31 00:01:43 +02:00
acurtis/antony@xiphis.org/ltantony.xiphis.org
38a59efbc9 add 2 placeholder values for config and system variables. 2006-08-30 14:27:29 -07:00
kostja@bodhi.local
3948fcf575 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-14897
 2006-08-31 00:14:19 +04:00
brian@zim.(none)
7ae3682dc8 This pulls two function calls which should have been handlerton calls out of handler.cc. 2006-08-30 12:28:25 -07:00
kostja@bodhi.local
7290fa2fb7 Post-merge fixes. 2006-08-30 23:09:47 +04:00
evgen@moonbone.local
fe18e36e73 sql_base.cc, ndb_condition_pushdown.result, opt_range.cc: 
After merge changes
 2006-08-30 22:11:23 +04:00
msvensson@neptunus.(none)
160a44dbc3 Merge neptunus.(none):/home/msvensson/mysql/bug21813/my50-bug21813 
into  neptunus.(none):/home/msvensson/mysql/bug21813/my51-bug21813
 2006-08-30 17:25:56 +02:00
msvensson@neptunus.(none)
f35371b9b4 Merge neptunus.(none):/home/msvensson/mysql/bug21813/my50-bug21813 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-30 17:21:22 +02:00
msvensson@neptunus.(none)
9d87db7767 Bug#21813 An attacker has the opportunity to bypass query logging, part2 
- Use the "%.*b" format when printing prepared and exeuted prepared statements to the log.
 - Add test case to check that also prepared statements end up in the query log
Bug#14346 Prepared statements corrupting general log/server memory
 - Use "stmt->query" when logging the newly prepared query instead of "packet"
 2006-08-30 17:11:00 +02:00
gluh@mysql.com/gluh.(none)
af9895d4c2 Bug#20393 User name truncation in mysql client 
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
 2006-08-30 15:56:17 +05:00
mskold/marty@mysql.com/linux.site
6bac3b8f40 NDBAPI cleanup 2006-08-30 11:41:21 +02:00
gluh@mysql.com/gluh.(none)
06d8fd7233 bug#21676 select * from information_schema.files crashes server 
skip engine handling if engine is disabled
 2006-08-30 13:42:31 +05:00
jonas@perch.ndb.mysql.com
c2d2b88b4c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-08-30 08:24:45 +02:00
kostja@bodhi.local
ebb7070430 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime-safemerge 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-08-30 03:00:19 +04:00
kostja@bodhi.local
8566db3fc7 Remove the fix for Bug#10668 "CREATE USER does not enforce username 
length limit", it's superseded by the fix for Bug#16899 "Possible buffer
overflow in handling of DEFINER-clause". Update test results.
 2006-08-30 01:48:15 +04:00
jonas@perch.ndb.mysql.com
365b69dc7f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-29 22:56:23 +02:00
kostja@bodhi.local
f8d34e1030 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-14897
 2006-08-30 00:45:33 +04:00
kostja@bodhi.local
3bf609b7f2 A fix for Bug#14897 "ResultSet.getString("table.column") sometimes 
doesn't find the column"

When a user was using 4.1 tables with VARCHAR column and 5.0 server
and a query that used a temporary table to resolve itself, the
table metadata for the varchar column sent to client was incorrect:
MYSQL_FIELD::table member was empty.

The bug was caused by implicit "upgrade" from old VARCHAR to new
VARCHAR hard-coded in Field::new_field, which did not preserve
the information about the original table. Thus, the field metadata
of the "upgraded" field pointed to an auxiliary temporary table
created for query execution.

The fix is to copy the pointer to the original table to the new field.
 2006-08-30 00:38:58 +04:00
rburnett@bk-internal.mysql.com
3cb32f9c4f Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-29 21:16:59 +02:00
rburnett@bk-internal.mysql.com
001aaedddc Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-29 21:15:49 +02:00
brian@zim.(none)
5c3ac45ca4 Re'ordering of startup. Fixed Execution path issues. Added function for de'initing everything. This includes Antony's suggestions (bk collapse uber alles!) 2006-08-29 11:58:12 -07:00
guilhem@gbichot3.local
121852a77f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  gbichot3.local:/home/mysql_src/mysql-5.1-maint
 2006-08-29 19:50:17 +02:00
kaa@polly.local
cde6246d27 Merge polly.local:/home/kaa/src/maint/m50-maint--07OGt 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-08-29 19:59:33 +04:00
kaa@polly.local
61482f3542 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
 2006-08-29 19:57:52 +04:00
guilhem@gbichot3.local
73625c3a11 Fix for BUG#20866 "show table status on innodb raises assertion" 
and its duplicate BUG#19057 "Test 'rpl_row_func003' fails on SuSE SLES9 x86".
It was an assertion failure, only in debug builds, not present
in released versions (nothing to document).
It happened when doing SHOW TABLE STATUS on an InnoDB table
having an auto_increment column, right after creating the table.
The test which would have caught this problem was disabled in 
mid-April for another reason (how much I like tests disabled for
months...).
 2006-08-29 17:37:48 +02:00
evgen@moonbone.local
8cf9781717 Merge moonbone.local:/work/tmp_merge-5.0-mysql 
into  moonbone.local:/work/tmp_merge-5.1-opt-mysql
 2006-08-29 18:58:50 +04:00
timour/timka@lamia.home
0368914b9a Merge lamia.home:/home/timka/mysql/src/5.0-bug-21456 
into  lamia.home:/home/timka/mysql/src/5.1-bug-21456
 2006-08-29 16:39:09 +03:00
cmiller@zippy.cornsilk.net
4f263f18f3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-29 09:00:36 -04:00
kroki/tomash@moonlight.intranet
b9fef61616 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug17591
 2006-08-29 14:37:52 +04:00
kroki/tomash@moonlight.intranet
f8f1dd3e87 BUG#17591: Updatable view not possible with trigger or stored function 
When a view was used inside a trigger or a function, lock type for
tables used in a view was always set to READ (thus making the view
non-updatable), even if we were trying to update the view.

The solution is to set lock type properly.
 2006-08-29 14:32:59 +04:00
gni/root@dev3-127.(none)
49e96f3bc9 Merge dev3-127.(none):/mnt/mysql/home/ngb/bug19873 
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1-bug19873
 2006-08-29 13:43:04 +08:00