mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
43217 commits 2781 branches 343 tags 1.6 GiB
Commit graph

43217 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaa@polly.local
52100678bd Merge polly.local:/tmp/maint/bug25137/my50-bug25137 
into  polly.local:/tmp/maint/bug25137/my51-bug25137
 2007-02-19 14:04:38 +03:00
msvensson@pilot.blaudden
51f96e43c5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 12:04:21 +01:00
msvensson@pilot.blaudden
478bb9e27c Update for running with cmd.exe directly 2007-02-19 12:03:42 +01:00
msvensson@pilot.blaudden
c2c4604580 Don't output escape char from 'do_eval' on windows. "It" won't 
know it's an escape char.
Replace /dev/null with NUL
Replace "closed stdout" with "not open fd"
 2007-02-19 12:00:17 +01:00
kaa@polly.local
315819fed0 Bug#18743: Several test cases fails if "classic" configuration in 5.0 
The problem happened because those tests were using "cp932" and "ucs2" without checking whether these character sets are available. This fix moves test parts to make character set specific parts be tested only if they are:
- some parts were moved to "ctype_ucs.test" and "ctype_cp932.test"
- some parts were moved to the newly added tests "innodb-ucs2.test", "mysqlbinglog-cp932.test" and "sp-ucs2.test"
 2007-02-19 13:57:06 +03:00
msvensson@pilot.blaudden
7970e9534b Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-16 16:13:56 +01:00
msvensson@pilot.blaudden
ee38195c90 Use " instead of ' to avoid win problem with ' 2007-02-16 16:08:08 +01:00
msvensson@pilot.blaudden
f6ab6506ba Add echo to be compiled 2007-02-16 15:33:54 +01:00
msvensson@pilot.blaudden
03b71c9209 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-16 15:32:51 +01:00
msvensson@pilot.blaudden
c1c7ba0aa0 Add echo.c to be built on Windows 2007-02-16 15:25:49 +01:00
msvensson@pilot.blaudden
b57994a7c2 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-16 15:23:27 +01:00
msvensson@pilot.blaudden
1d0a51730e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-16 15:23:11 +01:00
msvensson@pilot.blaudden
dc6f9d5d1b Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-16 15:23:06 +01:00
msvensson@pilot.blaudden
8ba162d761 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-16 15:22:31 +01:00
msvensson@neptunus.(none)
8931166e55 Workaround for problem where cygwin's bash/sh randomly fails with error 128 which 
mainly occurs on win2003 64bit.
 - Execute "exec" commands directly with cmd.exe and replace "--exec echo ..." with "--exec .\echo.exe ..."
 2007-02-16 15:19:38 +01:00
msvensson@pilot.blaudden
486dfab32b Merge 192.168.0.10:mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-15 15:56:38 +01:00
msvensson@pilot.blaudden
5349dffb36 Merge 192.168.0.10:mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint
 2007-02-15 15:56:05 +01:00
msvensson@neptunus.(none)
77dbeea616 Merge neptunus.(none):/home/msvensson/mysql/bug10777/my51-bug10777 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-15 15:45:45 +01:00
msvensson@neptunus.(none)
c11432eb4b Remove the hack to let lex_hash.h depend on it's tool and not the sources 2007-02-15 15:44:56 +01:00
msvensson@neptunus.(none)
c94085cc5d Merge neptunus.(none):/home/msvensson/mysql/bug10777/my50-bug10777 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-02-15 15:05:25 +01:00
msvensson@neptunus.(none)
68158c982d Merge neptunus.(none):/home/msvensson/mysql/bug10777/my41-bug10777 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2007-02-15 15:04:53 +01:00
msvensson@neptunus.(none)
8903aad4cd Merge neptunus.(none):/home/msvensson/mysql/bug10777/my50-bug10777 
into  neptunus.(none):/home/msvensson/mysql/bug10777/my51-bug10777
 2007-02-15 15:00:58 +01:00
msvensson@neptunus.(none)
cf5d849bcf Merge neptunus.(none):/home/msvensson/mysql/bug10777/my41-bug10777 
into  neptunus.(none):/home/msvensson/mysql/bug10777/my50-bug10777
 2007-02-15 14:58:24 +01:00
Kristofer.Pettersson@naruto.
cd0a43f528 Bug#25042 OPTIMIZE TABLE cause race condition in IO CACHE SHARE 
- The condition variable implementation "lost" a signal to
  WaitOnSingleObject when a semaphore was released.
- The signal could be consumed by a new call to pthread_cond_wait
  before all waiting threads had awoken.
- The new implementation of pthread_cond_* uses events
  instead of semaphores. It also uses an extra lock to protect entry
  into new cond wait before the broadcast has finished.
 2007-02-15 14:08:21 +01:00
msvensson@pilot.mysql.com
85cbf07673 Update error message to make sure all error strings for same error 
uses the same format specifiers
 2007-02-15 11:21:55 +01:00
msvensson@pilot.mysql.com
7771db0183 Remove the newly added space in error message, should not be there 2007-02-15 11:17:25 +01:00
msvensson@pilot.mysql.com
13f25e80c3 Merge pilot.mysql.com:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum 
into  pilot.mysql.com:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
 2007-02-14 19:34:22 +01:00
msvensson@pilot.mysql.com
67cc343c34 Add check of format specifiers in error message strings 
Update error message text accordingly to be equal between all translations
 2007-02-14 19:31:06 +01:00
cmiller@calliope.local.cmiller/calliope.local
80a35bfd39 Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint
 2007-02-14 12:24:11 -05:00
cmiller@calliope.local
38a008921f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint
 2007-02-14 11:43:10 -05:00
cmiller@calliope.local
81a46371a9 Merge calliope.local.cmiller:/Volumes/Source/src/mysql-5.0-maint 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint
 2007-02-14 11:38:39 -05:00
msvensson@pilot.mysql.com
def71e0fc7 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-14 17:35:04 +01:00
cmiller@calliope.local
adfd57b1e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint
 2007-02-14 11:34:03 -05:00
cmiller@calliope.local.cmiller/calliope.local
cbdaf5b641 Merge calliope.local.cmiller:/Volumes/Source/src/mysql-4.1-maint--bug25126 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.0-maint
 2007-02-14 11:27:37 -05:00
cmiller@zippy.cornsilk.net
434830547b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-02-14 10:57:01 -05:00
msvensson@pilot.mysql.com
07e9bebadf Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-14 16:51:04 +01:00
msvensson@pilot.mysql.com
c01c9b8899 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-14 16:50:15 +01:00
msvensson@pilot.mysql.com
9f720bb733 Use my_vsnprintf instead of vsnprintf 2007-02-14 16:49:41 +01:00
cmiller@zippy.cornsilk.net
757267b140 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-02-14 10:48:30 -05:00
cmiller@zippy.cornsilk.net
154f7f396e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-02-14 10:47:39 -05:00
msvensson@pilot.mysql.com
b6f78aa153 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-14 14:51:49 +01:00
msvensson@pilot.mysql.com
24a242bee1 Merge pilot.mysql.com:/home/msvensson/mysql/bug18628/my50-bug18628 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-14 14:45:15 +01:00
msvensson@pilot.mysql.com
45fe5879f4 Bug#18628 mysql-test-run: security problem(part1) 
- Implement --secure-file-priv=<dir> option that limits
  "load_file", "LOAD DATA" and "SELECT .. INTO OUTFILE" to work 
  with files in specified dir.
 - Use above option for mysqld in mysql-test-run.pl
 2007-02-14 14:44:34 +01:00
msvensson@pilot.mysql.com
e03946d1e4 Protect DBUG_ENTER printout from NULL pointers 2007-02-14 14:05:41 +01:00
msvensson@pilot.mysql.com
fcb305035b Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-14 14:03:49 +01:00
msvensson@pilot.mysql.com
a34b469a38 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-14 14:01:26 +01:00
igor@olga.mysql.com
d36e264cc5 Post-merge fix 2007-02-13 19:59:46 -08:00
igor@olga.mysql.com
a68e2d0172 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-02-13 16:09:38 -08:00
igor@olga.mysql.com
452c134d3f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-02-13 16:08:01 -08:00
ibabaev@bk-internal.mysql.com
0df74eae05 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-02-14 00:58:54 +01:00