mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40220 commits 2785 branches 343 tags 1.6 GiB
Commit graph

40220 commits

This branch
This branch
All branches
Author SHA1 Message Date
ted@ted.mysql.internal
09925858de Merge ted.mysql.internal:/home/ted/src/mysql/50-gca 
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
 2006-11-08 05:47:44 +03:00
ted@ted.mysql.internal
3e6735e277 BUG#20100 fix: mysql_upgrade modified to also accept all 
the communication parameters from the command line
and pass 'em correctly to both mysqlcheck and mysql
 2006-11-08 05:45:50 +03:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e30668f61a Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-11-07 23:28:55 +01:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e209edaa32 Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic
 2006-11-07 23:01:38 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1d932b992c Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic
 2006-11-07 22:55:19 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
7364bc113e Merge mysql.com:/Users/kent/mysql/bk/lic/my40-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my41-lic
 2006-11-07 22:49:46 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
3d7a9bdd6b make_binary_distribution.sh: 
Added LICENSE.mysql, removed LICENSE.doc README.NW.
  Removed obselete section about MySQLEULA.txt and README.NW.
README:
  Added reference to the EXCEPTIONS-CLIENT file.
  Changed reference to the commercial license file.
  Corrected references into chapters in the manual.
.del-MySQLEULA.txt~4a1afd9284f9be5a:
  Delete: Docs/MySQLEULA.txt
 2006-11-07 22:26:37 +01:00
petr/cps@outpost.site
fb650b8aad Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  outpost.site:/home/cps/mysql/trees/mysql-5.1-runtime
 2006-11-08 00:07:23 +03:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
016c4b1616 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
 2006-11-07 20:45:43 +01:00
lars/lthalmann@dl145h.mysql.com
3776e9622b Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-11-07 19:26:31 +01:00
msvensson@neptunus.(none)
f28c36d079 Bump version to 5.0.30 2006-11-07 18:21:52 +01:00
msvensson@neptunus.(none)
6bc6064ec4 Update result file after having changed error message 2006-11-07 17:42:15 +01:00
msvensson@neptunus.(none)
c64f5c7931 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-07 16:17:54 +01:00
msvensson@neptunus.(none)
ad63d2bdbe Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-07 16:17:04 +01:00
msvensson@neptunus.(none)
f5550c3304 Bug#23981 memory leaks from yassl code + other 
- Readd --skip-bdb when valgrinding
 2006-11-07 16:09:32 +01:00
joerg@trift2.
f15d3d8a71 Fix bug#24023: Let "ndb/src/common/portlib/gcc.cpp" export a dummy symbol. 2006-11-07 16:01:54 +01:00
msvensson@neptunus.(none)
ffa100d2d0 Bug#23981 memory leaks from yassl code + other 
- Fix memory leak in vio_VioSSLFD that occurs when one of the calls to SSL_* function fails. As in the "ssl_des"
   test case where the server is currently not supposed to be able to read the specific cert/key file.
 - Change error message to be generic as it's called both from server and client code.
 2006-11-07 15:20:24 +01:00
anozdrin/alik@alik.
6b0e7f3e4e Automerge fix. 2006-11-07 16:25:57 +03:00
anozdrin/alik@alik.
ee15c11b7c Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
 2006-11-07 16:24:35 +03:00
msvensson@neptunus.(none)
7b1add1abe Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-07 13:02:35 +01:00
msvensson@neptunus.(none)
2d952d336e Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-07 13:01:56 +01:00
msvensson@neptunus.(none)
a3602ca86d Don't allow path to be passed to --mem 2006-11-07 13:01:32 +01:00
msvensson@neptunus.(none)
3485b33453 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-07 12:58:24 +01:00
msvensson@neptunus.(none)
546250e244 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-07 12:57:30 +01:00
msvensson@neptunus.(none)
eea46ce15b Correct faulty commit, the opt_tastcase_timeout value is in minutes, to it need to be multiplied with 60 before ping passed to mtr_timer_start 2006-11-07 12:56:55 +01:00
lars/lthalmann@mysql.com/dl145h.mysql.com
aea1e14ef8 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-11-07 12:02:53 +01:00
lars/lthalmann@mysql.com/dl145h.mysql.com
db8aa4ab6c Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge
 2006-11-07 12:00:55 +01:00
anozdrin/alik@alik.
ab280f3f88 Merge alik.:/mnt/raid/alik/MySQL/devel/5.0 
into  alik.:/mnt/raid/alik/MySQL/devel/5.0-rt
 2006-11-07 13:50:00 +03:00
anozdrin/alik@alik.
7cf65fd309 Merge alik.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  alik.:/mnt/raid/alik/MySQL/devel/5.0-merged-5.0-rt
 2006-11-07 13:45:56 +03:00
msvensson@neptunus.(none)
d1e3febb12 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-07 11:15:03 +01:00
msvensson@neptunus.(none)
f4de95a886 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-07 11:13:03 +01:00
msvensson@neptunus.(none)
79ee2c6842 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-07 11:09:14 +01:00
msvensson@neptunus.(none)
9d13ee4c04 Make --mem settable with environment variable MTR_MEM and make it possible to pass the directory to use. I.e --mem=<directory> 2006-11-07 11:07:27 +01:00
msvensson@neptunus.(none)
2aeb4df7e3 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-07 10:48:46 +01:00
msvensson@neptunus.(none)
3ff26e9b27 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-07 10:48:14 +01:00
msvensson@neptunus.(none)
a52b9ffaae Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-07 10:46:49 +01:00
msvensson@neptunus.(none)
06ca418c35 Merge neptunus.(none):/home/msvensson/mysql/my50-rt-im_d_fix 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-07 10:44:44 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
599b731660 Bug#23451 GROUP_CONCAT truncates a multibyte utf8 character 
Problem: GROUP_CONCAT on a multi-byte column can truncate
  in the middle of a multibyte character when applying
  group_concat_max_len limit. It produces an invalid
  multi-byte character in the result string.
  
The second, easier version - reusing old "warning_for_row" flag,
instead of introducing of "result_is_full" - which was
added in the previous commit.
 2006-11-07 12:45:48 +04:00
ramil/ram@myoffice.izhnet.ru
b784565047 Merge mysql.com:/usr/home/ram/work/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/mysql-5.1-maint
 2006-11-07 12:12:59 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
28abd4dd0d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug19736/my50-bug19736
 2006-11-07 11:49:09 +04:00
baker@bk-internal.mysql.com
079506b5a0 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-07 06:59:51 +01:00
cmiller@zippy.cornsilk.net
144a98fc39 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-06 23:03:31 -05:00
cmiller@zippy.cornsilk.net
df27c5fa6b Merge fix. 2006-11-06 23:02:40 -05:00
petr/cps@outpost.site
1b44fe6196 Fix Bug #22494 Instance Manager: Inconsistent error message wording 
Use better wording
 2006-11-07 05:21:33 +03:00
cmiller@zippy.cornsilk.net
620dd4d023 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-06 20:42:28 -05:00
cmiller@zippy.cornsilk.net
19cb3d3bf7 Fix after merge. 2006-11-06 20:41:18 -05:00
cmiller@zippy.cornsilk.net
da6c5b18cc Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-11-06 18:01:47 -05:00
cmiller@zippy.cornsilk.net
a759280347 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my51-bug23411
 2006-11-06 17:46:50 -05:00
cmiller@zippy.cornsilk.net
40170fbf58 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my41-bug23411 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23411/my50-bug23411
 2006-11-06 17:45:47 -05:00
cmiller@zippy.cornsilk.net
87a5134b7c Bug#23411: ... MOD-ing zero returns strange result 
The Item_func_mod objects never had maybe_null set, so users had no reason 
to expect that they can be NULL, and may therefore deduce wrong results.
Now, set maybe_null.
 2006-11-06 17:13:19 -05:00