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

12843 commits

Author SHA1 Message Date
kaa@polly.local
f187430da2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-02-21 19:56:19 +03:00
kaa@polly.local
05750812d6 Moved the test requiring cp932 to a separate unit. 
This is for bug #18743.
 2007-02-21 19:50:48 +03: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
63baad73ae Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-20 21:02:06 +01:00
msvensson@pilot.blaudden
9da1b427a7 Test for setting general_log_file to a directory fails 
since /tmp is used as the directory. It does not always
exist so let's use one that always exists MYSQLTEST_VARDIR
 2007-02-20 21:00:05 +01:00
msvensson@pilot.blaudden
cf553c4361 Use "diff_files" instead ot "exec diff" 2007-02-20 18:47:47 +01:00
msvensson@pilot.blaudden
55b7f20a80 Use a temporary file to execute SQL commands with utf-8 chararcters 2007-02-20 18:35:59 +01:00
msvensson@pilot.blaudden
c282716844 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-20 18:22:50 +01:00
msvensson@pilot.blaudden
0d1d91e829 Replace "exec diff" with diff_files 2007-02-20 18:22:33 +01:00
msvensson@pilot.blaudden
dd74beb6be Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-20 18:21:14 +01:00
msvensson@pilot.blaudden
d6584a920b Add "diff_files" command to mysqltest 2007-02-20 18:20:58 +01:00
msvensson@pilot.blaudden
cab074cb22 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-20 13:06:25 +01:00
msvensson@pilot.blaudden
a799f2b637 Change "exec echo" commands with different delimiters that are also 
escape chars to use "write_file" to avoid confusion about what's what.
 2007-02-20 13:06:01 +01:00
msvensson@pilot.blaudden
a5045ace69 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 20:31:01 +01:00
msvensson@pilot.blaudden
1e9e0f4e74 Remove extra ; at end of line 2007-02-19 20:30:34 +01:00
msvensson@pilot.blaudden
3359145790 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 18:25:55 +01:00
msvensson@pilot.blaudden
bcb7521b0e Remove unportable constructs in mysqldump.test 2007-02-19 18:25:42 +01:00
msvensson@pilot.blaudden
9aeb8297b5 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 18:25:10 +01:00
msvensson@pilot.blaudden
b540ae533d Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 18:24:32 +01:00
msvensson@pilot.blaudden
d2fe11cb56 Commment out two test's thats just confusing for cmd.exe 2007-02-19 18:23:59 +01:00
msvensson@pilot.blaudden
420bf2a398 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 18:20:33 +01:00
msvensson@pilot.blaudden
cb84744145 Add cat_file command to mysqltest 2007-02-19 18:19:47 +01:00
msvensson@pilot.blaudden
16bce5b815 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 17:41:01 +01:00
msvensson@pilot.blaudden
1fd7e01089 Use a temporary file to pass UTF8 chars to "mysql" in a portable 
way
 2007-02-19 17:40:34 +01:00
msvensson@pilot.blaudden
afd6fb94e0 Remove non portable exec's from csv.test 2007-02-19 17:06:47 +01:00
msvensson@pilot.blaudden
f65cb65d23 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 16:42:54 +01:00
msvensson@pilot.blaudden
91967e5550 Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
 2007-02-19 16:40:11 +01:00
msvensson@pilot.blaudden
d2c02cd10d Add "append_file" command to mysqltest 2007-02-19 16:39:50 +01:00
msvensson@pilot.blaudden
a6ac991c83 Replace "exec rm" with remove_file and "exec touch" with "write_file" 2007-02-19 15:46:32 +01:00
kaa@polly.local
2606d6b9cb 5.1-specific fix for bug #18743. 
Moved tests requiring ucs2 from mix2_myisam.test to a separate unit.
 2007-02-19 15:31:55 +03:00
msvensson@pilot.blaudden
c122f59c0c Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
 2007-02-19 12:05:13 +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
msvensson@pilot.blaudden
478bb9e27c Update for running with cmd.exe directly 2007-02-19 12:03:42 +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
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
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
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.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
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
d36e264cc5 Post-merge fix 2007-02-13 19:59:46 -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
igor@olga.mysql.com
c84ee7079c Post-merge fix 2007-02-13 15:49:42 -08: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