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
50602 commits 2779 branches 343 tags 1.6 GiB
Commit graph

50602 commits

This branch
This branch
All branches
Author SHA1 Message Date
davi@moksha.com.br
9f088628eb Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/bugs/31409-5.1
 2007-10-10 21:16:53 -03:00
davi@moksha.com.br
2f946efda7 Mismerge broken 5.1-runtime compilation because do_command was defined 
static but it's still used by another compilation unit.

Remove static qualifier from do_command definition.
 2007-10-10 21:07:23 -03:00
davi@moksha.com.br
842a11ac9e Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-10 19:55:23 -03:00
davi@moksha.com.br
ed55fe3d96 Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-10 19:44:12 -03:00
davi@moksha.com.br
cbbf8fc9b9 Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-10 19:43:29 -03:00
davi@moksha.com.br
0df3c69597 Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-10 19:42:35 -03:00
davi@moksha.com.br
0b2bda4c2a Merge moksha.com.br:/Users/davi/mysql/mysql-5.0-runtime 
into  moksha.com.br:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-10 19:41:58 -03:00
davi@moksha.com.br
ae462f3e77 Post-merge test case for Bug 21587 2007-10-10 19:06:53 -03:00
davi@moksha.com.br
f74f363aac Merge moksha.com.br:/Users/davi/mysql/bugs/21587-5.0 
into  moksha.com.br:/Users/davi/mysql/bugs/21587-5.1
 2007-10-10 18:17:11 -03:00
mleich@four.local.lan
6a1a424f6f Merge four.local.lan:/WORK2/merge/mysql-5.1-parts 
into  four.local.lan:/WORK/mysql-5.1-build/src-clean
 2007-10-10 22:51:35 +02:00
tsmith@ramayana.hindu.god
f5b2e33154 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-10 14:17:54 -06:00
tsmith@ramayana.hindu.god
06c6fce750 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-10 14:15:09 -06:00
tsmith@ramayana.hindu.god
070dc3ffb5 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-10-10 14:12:36 -06:00
mleich@four.local.lan
88047100af Combined fix for 
Bug#31481 test suite parts: Many tests fail because of changed server error codes
   Bug#31243 Test "partition_basic_myisam" truncates path names
+ minor cleanup
 2007-10-10 22:03:10 +02:00
tsmith@ramayana.hindu.god
f6d110dc20 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-10 14:01:48 -06:00
tsmith@ramayana.hindu.god
ced64f8582 Bug #31517: Potential crash due to access of NULL thd in mark_transaction_to_rollback() 
Introduced in mark_transaction_to_rollback(), part of fix for bug 24989;
fix is to check thd for NULL before using it.
 2007-10-10 14:00:57 -06:00
kaa@polly.(none)
a2cbac3705 Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-11 00:00:50 +04:00
kaa@polly.(none)
4e146f3a15 Merge polly.(none):/home/kaa/src/maint/bug28878/my51-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
 2007-10-10 23:54:35 +04:00
kaa@polly.(none)
03c78594a3 Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-10 23:46:16 +04:00
kaa@polly.(none)
12b6074161 Merge polly.(none):/home/kaa/src/maint/bug28878/my50-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
 2007-10-10 23:44:01 +04:00
kaa@polly.(none)
9a0b9e03d4 Merge polly.(none):/home/kaa/src/maint/bug28878/my41-bug28878 
into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
 2007-10-10 23:39:53 +04:00
istruewing@stella.local
63b81a82d4 Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-10-10 21:25:57 +02:00
istruewing@stella.local
0ab9d3718d Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-10-10 21:25:19 +02:00
kaa@polly.(none)
7bd5aa9bd6 Merge polly.(none):/home/kaa/src/maint/bug28878/my50-bug28878 
into  polly.(none):/home/kaa/src/maint/bug28878/my51-bug28878
 2007-10-10 23:23:15 +04:00
kaa@polly.(none)
7ed0b70cce Merge polly.(none):/home/kaa/src/maint/bug28878/my41-bug28878 
into  polly.(none):/home/kaa/src/maint/bug28878/my50-bug28878
 2007-10-10 23:16:12 +04:00
dkatz@damien-katzs-computer.local
a234b8f365 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
 2007-10-10 14:48:25 -04:00
dkatz@damien-katzs-computer.local
ae22204c36 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
 2007-10-10 14:46:30 -04:00
istruewing@stella.local
da9b4288ed Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-10-10 20:44:05 +02:00
tsmith@ramayana.hindu.god
26b38b04ed Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-10-10 10:10:46 -06:00
gshchepa/uchum@gleb.loc
356007a8a4 Fixed bug #31471: decimal_bin_size: Assertion `scale >= 0 && 
precision > 0 && scale <= precision'.

A sign of a resulting item of the IFNULL function was not
updated and the maximal length of this result was calculated
improperly. Correct algorithm was copy&pasted from the IF
function implementation.
 2007-10-10 20:14:29 +05:00
istruewing@stella.local
5777cc2998 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  stella.local:/home2/mydev/mysql-5.1-bug15522
 2007-10-10 16:52:56 +02:00
anozdrin/alik@station.
ac83b3122c Fix for BUG#20023: mysql_change_user() resets the value 
of SQL_BIG_SELECTS.

The bug was that SQL_BIG_SELECTS was not properly set
in COM_CHANGE_USER.

The fix is to update SQL_BIG_SELECTS properly.
 2007-10-10 17:57:01 +04:00
mleich@four.local.lan
7c38ffe393 Fix for 
Bug#31407 funcs_1: <engine>__datadict tests broken because of wrong expected results
 2007-10-10 15:37:33 +02:00
gkodinov/kgeorge@magare.gmz
e971b18f06 Bug #30825: Problems when putting a non-spatial index on a GIS column 
Fixed the usage of spatial data (and Point in specific) with 
 non-spatial indexes.
 Several problems :
   - The length of the Point class was not updated to include the 
     spatial reference system identifier. Fixed by increasing with 4 
     bytes.
   - The storage length of the spatial columns was not accounting for
     the length that is prepended to it. Fixed by treating the 
     spatial data columns as blobs (and thus increasing the storage
     length)
   - When creating the key image for comparison in index read wrong
     key image was created (the one needed for and r-tree search,
     not the one for b-tree/other search). Fixed by treating the
     spatial data columns as blobs (and creating the correct kind of
     image based on the index type).
 2007-10-10 16:26:02 +03:00
anozdrin/alik@station.
05cf10bdf6 Cleanup sp.test. 2007-10-10 14:42:29 +04:00
anozdrin/alik@station.
c6c419f919 Fix automerge. 2007-10-10 13:53:24 +04:00
gluh@mysql.com/eagle.(none)
31cb283d1d Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2007-10-10 14:45:47 +05:00
anozdrin/alik@station.
50c8101ad8 Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2007-10-10 13:35:40 +04:00
gluh@eagle.(none)
e71717ab63 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-10 14:34:40 +05:00
gluh@eagle.(none)
27762854ef Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-10 14:33:46 +05:00
gluh@eagle.(none)
20ec6605d3 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-10-10 14:31:19 +05:00
gluh@mysql.com/eagle.(none)
f71e5825e5 after merge fix 2007-10-10 14:22:21 +05:00
gluh@eagle.(none)
3023ee9401 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2007-10-10 12:37:06 +05:00
gluh@mysql.com/eagle.(none)
a5e7b726c1 Bug#28893 --relay-log variable is not exposed with SHOW VARIABLES 
added variables relay_log, relay_log_index, relay_log_info_file to init_vars[]
to make them visible within SHOW VARIABLES
 2007-10-10 12:21:11 +05:00
gluh@mysql.com/eagle.(none)
91a7fbc8bb Bug#25359 Test 'view' is dependent on current year to be 2006 
removed now() call to make the test to be year independent
 2007-10-10 12:16:13 +05:00
mattiasj@mattiasj-laptop.(none)
312886fc2f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  mattiasj-laptop.(none):/home/mattiasj/clones/mysql-5.1-bug30484
 2007-10-10 08:30:02 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
ac0cf72c06 Merge mysql.com:/home/ram/work/mysql-5.1-maint 
into  mysql.com:/home/ram/work/b29444/b29444.5.1
 2007-10-10 10:20:19 +05:00
tsmith@ramayana.hindu.god
d207867cf5 Fix compiler warning (use correct data type) 2007-10-09 18:45:29 -06:00
malff@lambda.hsd1.co.comcast.net.
190bb6bf4c Fixed packet length for embedded tests 2007-10-09 18:12:13 -06:00
davi@virtua-cwbas201-21-158-74.ctb.virtua.com.br
0e9ccab47c Merge virtua-cwbas201-21-158-74.ctb.virtua.com.br:/Users/davi/mysql/push/bugs/28318-5.0 
into  virtua-cwbas201-21-158-74.ctb.virtua.com.br:/Users/davi/mysql/push/mysql-5.0-runtime
 2007-10-09 20:48:37 -03:00