mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 19:41:47 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41398 commits 2793 branches 343 tags 1.7 GiB
Commit graph

41398 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
9eb8a3fbee change all auto_ptr in yaSSL to mySTL since some lack reset 2006-12-13 23:30:20 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
46e07cc9d2 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug22377/my41-bug22377
 2006-12-13 14:05:29 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
5e8e4745d8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/bug22377/my50-bug22377
 2006-12-13 13:19:19 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
b008f24ece Merge mysql.com:/usr/home/ram/work/bug22377/my41-bug22377 
into  mysql.com:/usr/home/ram/work/bug22377/my50-bug22377
 2006-12-13 13:02:11 +04:00
df@kahlann.erinye.com
b9cce096a2 BUG#24896 magnus' suggestion 2006-12-12 15:47:02 +01:00
gluh@gluh.(none)
6a49f0cd93 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2006-12-12 18:01:44 +04:00
gluh@gluh.(none)
c6d9cf1b12 Merge mysql.com:/home/gluh/MySQL/Merge/5.1 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2006-12-12 17:59:34 +04:00
df@kahlann.erinye.com
bd44245eb6 BUG#24902 in 5.0 2006-12-12 13:55:40 +01:00
gluh@mysql.com/gluh.(none)
635a5641bc Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2006-12-12 15:41:43 +04:00
msvensson@neptunus.(none)
8bc9d6dd41 Improve error message that describes waitpid($pid) returned unexpected result 2006-12-12 12:28:02 +01:00
gluh@mysql.com/gluh.(none)
118a0c7fe2 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2006-12-12 14:01:06 +04:00
df@kahlann.erinye.com
682f8fe2e4 BUG#24902 2006-12-12 10:36:52 +01:00
msvensson@neptunus.(none)
a31827f923 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-11 17:05:04 +01:00
msvensson@neptunus.(none)
b880d8aa05 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-11 17:04:14 +01:00
msvensson@neptunus.(none)
4f042fe207 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-11 17:03:01 +01:00
msvensson@neptunus.(none)
eb1c280142 Wait for INSERT DELAYED to finish i.e sleep in while loop until 
"select count" is one more.
 2006-12-11 16:43:21 +01:00
msvensson@neptunus.(none)
8a7ea3c744 Bug#20225 mysqltest runs in an endless loop when trying to start rpl_sys test suite 
- Add printout in safe_connect indicating that mysqltest is in a loop waiting for
connection to mysqld. Will be printed when --verbose is passed as argument to
  mysqltest
 2006-12-11 15:39:15 +01:00
Kristofer.Pettersson@naruto.
b7b1aab081 Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  naruto.:C:/cpp/mysql-5.0-maint
 2006-12-11 14:22:56 +01:00
Kristofer.Pettersson@naruto.
7651675dcd Merge kpettersson@bk-internal:/home/bk/mysql-5.1-new-maint 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-12-11 13:33:23 +01:00
Kristofer.Pettersson@naruto.
74108797b7 Merge naruto.:C:/cpp/bug17489/my51-bug17489 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-12-11 13:22:47 +01:00
msvensson@neptunus.(none)
8dc5c6a407 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-11 13:13:48 +01:00
Kristofer.Pettersson@naruto.
0d7f94da7b Merge naruto.:C:/cpp/bug17489/my50-bug17489 
into  naruto.:C:/cpp/mysql-5.0-maint
 2006-12-11 13:13:05 +01:00
msvensson@neptunus.(none)
98e062a9c3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-11 13:12:54 +01:00
msvensson@neptunus.(none)
1bdceff9be Merge bk-internal:/home/bk/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-12-11 13:08:05 +01:00
Kristofer.Pettersson@naruto.
119afb19c3 Merge naruto.:C:/cpp/bug17489/my41-bug17489 
into  naruto.:C:/cpp/mysql-4.1-maint
 2006-12-11 13:06:59 +01:00
Kristofer.Pettersson@naruto.
7de635497d Merge kpettersson@bk-internal:/home/bk/mysql-5.0-maint 
into  naruto.:C:/cpp/mysql-5.0-maint
 2006-12-11 12:50:40 +01:00
msvensson@neptunus.(none)
4a59a9cd2c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-11 12:34:48 +01:00
msvensson@neptunus.(none)
fdbc84d27c Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-11 12:33:44 +01:00
Kristofer.Pettersson@naruto.
0068e13e2f Bug#17489 failed to put data file in custom directory use "data directory" option 
- Updated result file to fit test case automerge.
 2006-12-11 12:33:42 +01:00
gluh@mysql.com/gluh.(none)
f0f4d3c0bd Merge mysql.com:/home/gluh/MySQL/Merge/4.1 
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
 2006-12-11 15:32:07 +04:00
msvensson@neptunus.(none)
ba6d2bbf64 Pass --no-defaults to embedded server to avoid that it reads any defaults file 2006-12-11 12:16:20 +01:00
msvensson@neptunus.(none)
510c9627e1 Fix merge error in mysql-test/Makefile.am 2006-12-11 12:06:12 +01:00
msvensson@neptunus.(none)
97f2b1af25 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-11 11:32:55 +01:00
msvensson@neptunus.(none)
160a3dce64 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-11 11:28:11 +01:00
msvensson@neptunus.(none)
4e34f77c85 Bug#23735 mysqlbinlog client fails when reading binlog from stdin 
- Windows opens stdin in text mode by default. Certain characters
   such as CTRL-Z are interpeted as events and the read() method
   will stop. CTRL-Z is the EOF marker in Windows. to get past this
   you have to open stdin in binary mode. Setmode() is used to set
   stdin in binary mode. Errors on setting this mode result in
   halting the function and printing an error message to stderr.
 2006-12-11 11:25:45 +01:00
df@kahlann.erinye.com
78e1df3e9f Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2006-12-11 10:51:29 +01:00
df@kahlann.erinye.com
476632aad9 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2006-12-11 10:49:31 +01:00
df@kahlann.erinye.com
024597b3e1 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-11 10:45:39 +01:00
Kristofer.Pettersson@naruto.
81ec16b751 Merge naruto.:C:/cpp/bug17489/my50-bug17489 
into  naruto.:C:/cpp/bug17489/my51-bug17489
 2006-12-10 17:01:27 +01:00
Kristofer.Pettersson@naruto.
57abd1dc1e Merge naruto.:C:/cpp/bug17489/my41-bug17489 
into  naruto.:C:/cpp/bug17489/my50-bug17489
 2006-12-10 16:40:15 +01:00
tsmith/tim@siva.hindu.god
50e372d608 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/51
 2006-12-08 16:39:58 -07:00
tsmith/tim@siva.hindu.god
d54c696c24 Merge siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/41 
into  siva.hindu.god:/usr/home/tim/m/bk/tmp/fix-Makefile-perl/50
 2006-12-08 16:26:41 -07:00
tsmith/tim@siva.hindu.god
a58d08513b Makefile.am 
- test* targets are identical (as much as possible) to 5.0 & 5.1 versions
    - use @PERL@ ./mysql-test-run.pl, instead of depending on /usr/bin/perl location
    - PHONY: target includes all test targets
 2006-12-08 16:17:46 -07:00
kaa@polly.local
d9dc018226 Merge polly.local:/tmp/maint/bug24261/my51-bug24261 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2006-12-08 23:47:49 +03:00
kaa@polly.local
6d1e7bcf7b Merge polly.local:/tmp/maint/bug24261/my50-bug24261 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2006-12-08 22:38:03 +03:00
msvensson@neptunus.(none)
5817838c06 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-08 17:10:54 +01:00
msvensson@neptunus.(none)
cb903ec340 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-08 17:09:43 +01:00
msvensson@neptunus.(none)
9636ead18d Bug#19410 Test 'kill' fails on Windows + SCO 2006-12-08 17:09:07 +01:00
msvensson@neptunus.(none)
aba988485a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-08 16:53:59 +01:00
msvensson@neptunus.(none)
3a4491c70a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-08 16:50:54 +01:00