mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 17:33:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
39326 commits 2783 branches 343 tags 1.7 GiB
Commit graph

11563 commits

Author SHA1 Message Date
andrey@example.com
d18cb100be Merge example.com:/work/bug23037/my50 
into  example.com:/work/bug23037/my51
 2006-10-23 14:29:11 +02:00
andrey@example.com
389c6a019e Fix for bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table" 
To the documentor: The DEFAULT value in SHOW COLUMNS/SELECT FROM I_S.COLUMNS
was truncated to NAME_LEN (which effectively is 64) characters.
 2006-10-23 13:12:30 +02:00
iggy@rolltop.ignatz42.dyndns.org
2ec5a57ff4 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my51-bug19745 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-10-18 19:28:37 -04:00
iggy@rolltop.ignatz42.dyndns.org
b61c3a7361 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my50-bug19745 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug19745/my51-bug19745
 2006-10-18 18:48:02 -04:00
iggy@rolltop.ignatz42.dyndns.org
3c31c84200 Bug#19745: mysqldump --xml produces invalid xml 
The mysqldump command with both the --xml and --hex-blob options will output blob data encoded as hexBinary.  
The proper XML datatype is xs:hexBinary.  
The correct XML datatype is specified be setting the xsi_type attribute equal to xs:hexBinary for each encoded element.
 2006-10-18 18:43:51 -04:00
msvensson@neptunus.(none)
4d59b37f27 Merge neptunus.(none):/home/msvensson/mysql/bug21868/my50-bug21868 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-19 00:14:22 +02:00
cmiller@zippy.cornsilk.net
cf9f5b8b14 Merge fixes. 2006-10-17 16:22:44 -04:00
cmiller@zippy.cornsilk.net
91c4edfbfb Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint_20061016 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-10-17 12:00:36 -04:00
cmiller@zippy.cornsilk.net
184467a2cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-10-17 11:23:07 -04:00
cmiller@zippy.cornsilk.net
3a709f50b2 Fix previous bad patch for Bug#14262. 
Remove table engine qualification where it's unnecessary.
 2006-10-17 11:06:11 -04: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
mikael/pappa@dator5.(none)
4a7cd3a1cb Merge dator5.(none):/home/pappa/clean-mysql-5.1 
into  dator5.(none):/home/pappa/bug18198
 2006-10-16 15:40:40 -04:00
msvensson@shellback.(none)
ffc9538bb4 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-14 19:55:06 +02:00
msvensson@shellback.(none)
cfd442b67f Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-14 17:49:14 +02:00
msvensson@shellback.(none)
8c55cf8f9a rpl_empty_master_crash need a master restart so that all log files are deleted 2006-10-13 20:22:56 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
0e3ccedd6b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug23254/my41-bug23254
 2006-10-13 21:12:07 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
23727a851b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug23254/my50-bug23254
 2006-10-13 21:09:20 +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
msvensson@shellback.(none)
c31a028b9d Optimize restarts by using --force-restart option 2006-10-13 11:53:19 +02:00
msvensson@shellback.(none)
6e3280fd3b Add missing semicolon in test file 2006-10-13 08:48:47 +02: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
msvensson@shellback.(none)
1be01ceea8 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-12 18:48:03 +02:00
msvensson@shellback.(none)
1b06c7c78e Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint-new
 2006-10-12 17:37:59 +02:00
kaa@polly.local
8c88bb4eaa Merge polly.local:/tmp/maint/bug22728/my41-bug22728 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-12 13:39:52 +04: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
kaa@polly.local
1ceb8d34ad Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-10-12 12:12:09 +04:00
kaa@polly.local
2667443173 Merge polly.local:/tmp/maint/bug11655/my50-bug11655 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-10-12 11:28:44 +04:00
tsmith/tim@siva.hindu.god
64e1a13d0e Merge siva.hindu.god:/usr/home/tim/m/bk/b19764/50 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/50
 2006-10-11 23:38:15 -06: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
msvensson@shellback.(none)
29238d914c Merge bk-internal:/home/bk/mysql-5.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-11 17:41:21 +02:00
msvensson@shellback.(none)
21d8e25303 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-11 14:57:59 +02:00
msvensson@shellback.(none)
c4db04fc27 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-11 14:54:36 +02:00
msvensson@shellback.(none)
3e37764216 Improve restart logic all code to detect restart is now in the functions 
'run_testcase_need_master/slave_restart'
Remove the faulty qw
Only look for mysql_fix_privilege_tables if not windows
 2006-10-11 14:50:19 +02:00
kaa@polly.local
737e13e526 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-11 14:57:09 +04:00
kaa@polly.local
a050de9837 Merge polly.local:/tmp/maint/bug11655/my41-bug11655 
into  polly.local:/home/kaa/src/maint/m41-maint--07OGk
 2006-10-11 14:55:23 +04:00
kaa@polly.local
29b5e2955e Merge polly.local:/tmp/maint/bug11655/my50-bug11655 
into  polly.local:/tmp/maint/bug11655/my51-bug11655
 2006-10-11 14:22:17 +04:00
kaa@polly.local
02ac635027 Merge polly.local:/tmp/maint/bug11655/my41-bug11655 
into  polly.local:/tmp/maint/bug11655/my50-bug11655
 2006-10-11 14:16:30 +04:00
Kristofer.Pettersson@naruto.
2e5063f97a Merge naruto.:C:/cpp/bug21811/my51-bug21811 
into  naruto.:C:/cpp/mysql-5.1-new-maint
 2006-10-11 11:05:55 +02:00
kaa@polly.local
456fe01d7e Fix for bug #22728 "Handler_rollback value is growing". 
The bug is present only in 4.1, will be null-merged to 5.0

For InnoDB, check value of thd->transaction.all.innodb_active_trans instead of thd->transaction.stmt.innobase_tid to see if we really need to rollback.
 2006-10-11 12:44:03 +04:00
Kristofer.Pettersson@naruto.
d51e3b6cb5 Merge naruto.:C:/cpp/bug21811/my50-bug21811 
into  naruto.:C:/cpp/mysql-5.0-maint
 2006-10-11 10:41:22 +02:00
msvensson@neptunus.(none)
5b24780877 Merge bk-internal:/home/bk/mysql-5.1-rpl 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-10-11 10:16:46 +02:00
msvensson@neptunus.(none)
ed250c1763 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-10-11 10:01:43 +02:00
ted@ted.mysql.internal
e8cee6dff0 BUG#21524 ER_CANT_OPEN_LIBRARY output message used to confuse mysqltest on Solaris. Varying part of the message is now suppressed 2006-10-11 07:08:32 +04:00
ted@ted.mysql.internal
27bb6c08d9 BUG#21524 ps.test updated to meet recent changes in SQL parser 2006-10-11 02:36:36 +04:00
lars@black.(none)
0b4e65e12b Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-10-10 21:59:23 +02:00
jonas@perch.ndb.mysql.com
e600a3d394 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-10-10 11:25:24 +02:00
cmiller@zippy.cornsilk.net
86c5603c72 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my51-bug17583
 2006-10-09 18:55:09 -04:00
cmiller@zippy.cornsilk.net
6a870d4cfc Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug17583/my50-bug17583
 2006-10-09 18:54:48 -04:00