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

38987 commits

This branch
This branch
All branches
Author SHA1 Message Date
tsmith/tim@siva.hindu.god
a42a06cff5 Update ps and show_check results to account for new -master.opt settings. 2006-10-17 12:15:14 -06:00
Kristofer.Pettersson@naruto.
cda2a11330 Merge naruto.:C:/cpp/bug23010/my51-bug23010 
into  naruto.:C:/cpp/mysql-5.1-new-maint
 2006-10-17 13:32:58 +02:00
Kristofer.Pettersson@naruto.
44e01d4144 Merge naruto.:C:/cpp/bug23010/my50-bug23010 
into  naruto.:C:/cpp/bug23010/my51-bug23010
 2006-10-17 10:37:55 +02:00
tsmith/tim@siva.hindu.god
60de8b58bc Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/51 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/51
 2006-10-16 20:18:11 -06:00
tsmith/tim@siva.hindu.god
285c14d3e7 Merge siva.hindu.god:/usr/home/tim/m/bk/b4053/51 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/mrgOct16/51
 2006-10-16 20:10:48 -06:00
tsmith/tim@siva.hindu.god
9711333914 Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50 
into  siva.hindu.god:/usr/home/tim/m/bk/b19764/51
 2006-10-16 18:42:22 -06:00
ramil/ram@myoffice.izhnet.ru
0d9046ca27 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  mysql.com:/usr/home/ram/work/bug23254/my51-bug23254
 2006-10-13 21:06:56 +05:00
ramil/ram@myoffice.izhnet.ru
bbd3470ec7 Merge mysql.com:/usr/home/ram/work/bug23254/my50-bug23254 
into  mysql.com:/usr/home/ram/work/bug23254/my51-bug23254
 2006-10-13 19:33:28 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
84048dc763 Merge mysql.com:/usr/home/ram/work/bug23254/my41-bug23254 
into  mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
 2006-10-13 19:09:22 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
31402835d4 Fix for bug #23254: COMPRESS(NULL) makes all futher COMPRESS() calls on same Item return NULL 
We don't set null_value to 0 in the Item_func_compress::val_str() for 
not-NULL results.
 2006-10-13 19:05:54 +05:00
cmiller@zippy.cornsilk.net
9268074ec9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my51-alter
 2006-10-13 08:43:13 -04:00
tsmith/tim@siva.hindu.god
0e3cfe02ec Bug #19764: SHOW commands end up in the slow log as table scans 
Do not consider SHOW commands slow queries, just because they don't use proper indexes.

This bug fix is not needed in 5.1, and the code changes will be null merged.  However, the test cases will be propogated up to 5.1.
 2006-10-12 17:10:34 -06:00
cmiller@zippy.cornsilk.net
177f6c64df Additional patch for 5.1 commit for Bug#14262. 2006-10-12 17:51:56 -04:00
kaa@polly.local
ecb9b0cb02 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-10-12 18:32:03 +04:00
kaa@polly.local
0f23fb5dac Merge polly.local:/tmp/maint/bug22728/my51-bug22728 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-10-12 18:29:01 +04:00
kaa@polly.local
9602f69b99 Merge polly.local:/tmp/maint/bug22728/my50-bug22728 
into  polly.local:/tmp/maint/bug22728/my51-bug22728
 2006-10-12 18:20:07 +04:00
msvensson@shellback.(none)
de5262252f Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-12 16:18:14 +02:00
msvensson@shellback.(none)
fe7fce3664 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-12 16:17:31 +02:00
msvensson@shellback.(none)
2db82814c4 Add missing semicolon 2006-10-12 16:17:09 +02:00
kaa@polly.local
667f5b1470 Merge polly.local:/tmp/maint/bug22728/my41-bug22728 
into  polly.local:/tmp/maint/bug22728/my50-bug22728
 2006-10-12 18:14:12 +04:00
msvensson@shellback.(none)
82a099709a Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-12 14:15:17 +02:00
msvensson@shellback.(none)
5abdd04686 Make all compile-netware-* scripts executable 2006-10-12 14:14:54 +02:00
msvensson@shellback.(none)
57ad872b24 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-12 13:53:21 +02:00
msvensson@shellback.(none)
925220627c Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-12 13:51:54 +02:00
msvensson@shellback.(none)
6c31690bbd Move the reconnect variable to beginning of function 
Fix warning about value from "*ptr++" not being used. Changed it to ptr++
 2006-10-12 13:50:50 +02:00
msvensson@shellback.(none)
2c4456d30f Add win paths for mysql_client_test 2006-10-12 13:49:12 +02:00
msvensson@shellback.(none)
2c6985b325 5.1 should use libc-2006 by default 2006-10-12 13:31:41 +02:00
msvensson@shellback.(none)
d739a91acb Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-12 13:28:56 +02:00
msvensson@shellback.(none)
27737f0bd4 Use libc-2003 if available else default to libc 2006-10-12 13:28:18 +02:00
msvensson@shellback.(none)
bcf1bc4ccb Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-12 12:21:16 +02:00
msvensson@shellback.(none)
1d77363c40 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-12 12:19:52 +02:00
msvensson@shellback.(none)
d093b1029a Look for mysql_client_test in $path_client_bindir 2006-10-12 12:19:23 +02:00
msvensson@shellback.(none)
9a65dbea42 Only one switch for ssl(--with-ssl) in 5.1 2006-10-12 12:14:50 +02:00
msvensson@shellback.(none)
db72ea9023 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-12 12:12:11 +02:00
msvensson@shellback.(none)
42a227e967 Switch to use yaSSL instead of OpenSSL on Netware 2006-10-12 12:11:23 +02:00
msvensson@shellback.(none)
e42934f169 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-12 11:57:50 +02:00
msvensson@shellback.(none)
1c9b35cdd7 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-12 11:39:41 +02:00
msvensson@shellback.(none)
5741683d12 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-12 11:30:07 +02:00
msvensson@shellback.(none)
3c66250e84 Fix unhandled exception in mysql-test-run.pl, creating a dir that already exist 2006-10-12 11:29:13 +02:00
msvensson@shellback.(none)
71cb0e8dc5 Only print cur_file->filename if cur_file->file is set 
MOve DBUG_ASSERT(result_file_name) to after DBUG_ENTER
Change type of "reconnect" variable from int to my_bool, reconnect didn't work on Solaris without that
 2006-10-12 10:49:59 +02:00
kaa@polly.local
a82e5d4a55 Merge polly.local:/tmp/maint/bug11655/my51-bug11655 
into  polly.local:/home/kaa/src/maint/m51-new-maint--07OGx
 2006-10-12 12:36:13 +04:00
msvensson@shellback.(none)
d534a6b905 Add DBUG_ASSERT to check that mysql is not null when mysql_reconnect is called 
Add DBUG_PRINT to show the value of mysql->reconnect
 2006-10-12 10:27:44 +02:00
kaa@polly.local
105434f865 Merge polly.local:/tmp/maint/bug11655/my50-bug11655 
into  polly.local:/tmp/maint/bug11655/my51-bug11655
 2006-10-12 11:21:52 +04:00
kaa@polly.local
e89fdaac73 5.0-specific fixes when merging the fix for bug #11655 and bug #20927 from 4.1 2006-10-12 11:21:12 +04:00
tsmith/tim@siva.hindu.god
360540e891 Revert patch for bug #19764, which did not work with prepared statements. 2006-10-11 23:35:52 -06:00
cmiller@zippy.cornsilk.net
1279acd975 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my50-bug14262 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug14262/my51
 2006-10-11 16:49:59 -04:00
msvensson@shellback.(none)
0eb2fff749 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-11 21:56:09 +02:00
msvensson@shellback.(none)
5b8312986c Fixes for embedded server test 2006-10-11 21:53:43 +02:00
msvensson@shellback.(none)
a9c3db68cd Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-11 20:02:09 +02:00
msvensson@shellback.(none)
d070c84fee Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-11 19:41:36 +02:00