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

19707 commits

Author SHA1 Message Date
msvensson@pilot.blaudden
06432e396b Bug#26536 func_time failure on vm-win2003-64-b, occurs every time 
- my_time_t is defined as long which means it will not always be the
same size as time_t. See explanation in include/my_time.h
 2007-02-27 16:58:40 +01:00
msvensson@pilot.blaudden
1c470cfcaa Extend the max length of second format specifier to max length 
200 allowing it to print paths a little better
 2007-02-23 18:07:08 +01:00
msvensson@pilot.blaudden
907296b0aa Merge pilot.blaudden:/home/msvensson/mysql/bug26536/my51-bug26536 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-23 18:00:05 +01:00
msvensson@pilot.blaudden
b4d06c0d83 Merge pilot.blaudden:/home/msvensson/mysql/bug26536/my50-bug26536 
into  pilot.blaudden:/home/msvensson/mysql/bug26536/my51-bug26536
 2007-02-23 17:34:19 +01:00
msvensson@pilot.blaudden
7e292b9a9a Bug#26536 func_time failure on vm-win2003-64-b, occurs every time 
- Avoid overflow in sec_since_epoch by shifting the time
   back 2 days for times close to the maximum range of my_time_t
 - Improve comment about why we need my_time_t
 - Patch will also fix timezone2.test
 2007-02-23 17:33:11 +01:00
msvensson@pilot.blaudden
4db696a2ba Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
 2007-02-22 19:15:32 +01:00
msvensson@pilot.blaudden
1785958c7a Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum 
into  pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum
 2007-02-22 17:54:07 +01:00
msvensson@pilot.blaudden
43fae314a1 Bug#24617 Typo in Czech translation 2007-02-22 17:53:41 +01:00
msvensson@pilot.blaudden
05305f462b Bug #26571 Different format specifiers in errmsg.txt 
- Add check of format specifiers in error message strings
- Update error message text accordingly to be equal between all translations
 2007-02-22 16:41:51 +01:00
kaa@polly.local
41eccda1df Merge polly.local:/tmp/maint/bug25137/my51-bug25137 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-02-20 23:16:18 +03:00
msvensson@pilot.blaudden
e3448ec05a Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my50-comp_err_checksum 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 12:50:36 +01:00
msvensson@pilot.blaudden
dfa723f2ea Merge pilot.blaudden:/home/msvensson/mysql/comp_err_checksum/my51-comp_err_checksum 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 12:33:04 +01:00
msvensson@pilot.blaudden
fc432d871a Clean "gen_lex_hash" if it's been built 2007-02-19 12:25:25 +01:00
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
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
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@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)
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
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
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
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
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
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
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
ibabaev@bk-internal.mysql.com
266300142e Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
 2007-02-13 23:35:06 +01:00
igor@olga.mysql.com
a196ccafe6 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-02-13 13:31:23 -08:00
igor@olga.mysql.com
273d016aad Post-merge fix. 2007-02-13 13:15:23 -08:00
cmiller@zippy.cornsilk.net
094277c1bf Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-02-13 10:23:32 -05:00
cmiller@zippy.cornsilk.net
6473de8db1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-02-13 10:02:00 -05:00
igor@olga.mysql.com
fb9e0ad3be Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-02-13 01:34:36 -08:00
msvensson@pilot.mysql.com
b74a067246 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-13 10:27:39 +01:00
msvensson@pilot.mysql.com
818cb094fc Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-13 09:56:56 +01:00
igor@olga.mysql.com
0461228a70 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug26209
 2007-02-12 23:10:33 -08:00
ibabaev@bk-internal.mysql.com
4aab8494e9 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
 2007-02-13 00:00:27 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
30614d22c1 Merge mysql.com:/home/hf/work/20691/my50-20691 
into  mysql.com:/home/hf/work/25492/my50-25492
 2007-02-13 01:23:23 +04:00
holyfoot/hf@hfmain.(none)
a7e4f44a25 Merge mysql.com:/home/hf/work/20691/my50-20691 
into  mysql.com:/home/hf/work/20691/my51-20691
 2007-02-13 01:22:43 +04:00
cmiller@calliope.local
681ee2a225 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  calliope.local.cmiller:/Volumes/Source/src/mysql-5.1-maint
 2007-02-12 14:39:42 -05:00
gluh@mysql.com/eagle.(none)
6caff6f708 valgrind error fix 2007-02-12 19:28:49 +04:00
tnurnberg@mysql.com/sin.azundris.com
293352cbe4 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/tnurnberg/24660/50-24660
 2007-02-12 14:49:34 +01:00