database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-21 08:47:42 +03:00
Code Activity
41,673 Commits 3,241 Branches 1,092 Tags
c8bc42ccff63c26bb77d0ed88df9a08b1642f30b
Commit Graph

15774 Commits

Author SHA1 Message Date
patg@radha.local
cd32c0b948 WL# 3031 
Found that the results from select had to be fixed too.
 2006-12-12 19:39:45 -05:00
patg@radha.local
45d734dba7 WL #3031 
changed to test verbiage to test PB on 5.1 arch tree
 2006-12-12 19:12:30 -05:00
patg@radha.local
69e774f522 WL #3031 
Trying again (!) to commit the fix containing replace-result to fix the problem
with hard-coded ports in the result file of the federated_server test.
 2006-12-12 17:23:11 -05: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
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
patg@radha.myhome.westell.com
b892f9adf8 WL #3031 
* New result files due to new error message/error numbers
* Fixed system_mysql_db tests to work with servers table
* Added UTF8 charset to table defs
 2006-12-11 11:44:03 -05: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
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
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
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
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)
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
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
patg@govinda.patg.net
ca65d01701 WL #3031 
Change to test results, committing so I can clone to another box to complete merge.
 2006-12-09 13:33:26 -05:00
jonas@perch.ndb.mysql.com
d5cd8df3be ya typo 2006-12-09 11:45:33 +01:00
jonas@perch.ndb.mysql.com
3c3f65c42b fix bug in make install 2006-12-09 11:08:12 +01:00
patg@govinda.patg.net
f9097b86af Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-arch-wl3031-merge
 2006-12-08 22:30:18 -05:00
patg@govinda.patg.net
98062f567d WL# 3031 
Post-commit issues fixed
* Test results for other tests fixed due to added error #s
* Memory allocation/free issues found with running with valgrind
* Fix to mysql-test-run shell script to run federated_server test (installs
mysql.servers table properly)
 2006-12-08 22:19:51 -05:00
jonas@perch.ndb.mysql.com
11edb43a37 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-12-08 22:18:59 +01: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
istruewing@chilla.local
05dde1f311 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-12-08 15:55:56 +01:00
kaa@polly.local
439ce0307b Merge polly.local:/tmp/maint/bug24261/my50-bug24261 
into  polly.local:/tmp/maint/bug24261/my51-bug24261
 2006-12-08 16:02:42 +03:00
msvensson@neptunus.(none)
8b6e5d4dfa Backport fix for mysqladmin on windows test failure 2006-12-08 13:37:40 +01:00
istruewing@chilla.local
df2b93439f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2006-12-08 12:28:21 +01:00
msvensson@neptunus.(none)
0b41593db6 Fix problems with "make dist" and running from "binary dist" 2006-12-08 12:13:43 +01:00
Kristofer.Pettersson@naruto.
ecbb4eb987 Bug#17498 failed to put data file in custom directory use "data directory" option 
- Using DATA/INDEX DIRECTORY option on Windows put data/index file into
  default directory because the OS doesn't support readlink().
- The procedure for changing data/index file directory is 
  different under Windows.
- With this fix we report a warning if DATA/INDEX option is used,
  but OS doesn't support readlink().
 2006-12-07 17:01:00 +01:00
mskold/marty@mysql.com/linux.site
79542f0584 ps_7ndb problem now fixed 2006-12-07 16:30:30 +01:00
mskold/marty@mysql.com/linux.site
6b4b402977 Bug#24818 CREATE UNIQUE INDEX (...) USING HASH on a NDB table crashes mysqld: Re-generated test result 2006-12-07 16:27:38 +01:00
df@kahlann.erinye.com
8fffa20a5a Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
 2006-12-07 16:08:55 +01:00
mskold/marty@linux.site
c39c7b6f2b Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2006-12-07 16:08:14 +01:00
df@kahlann.erinye.com
75c7114124 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2006-12-07 16:07:14 +01:00