Commit graph

23985 commits

Author SHA1 Message Date
kent@mysql.com
5b8bac3767 mysql-test-run.sh:
Corrected path to CA certificate
2005-06-24 11:56:20 +02:00
kent@mysql.com
293c225920 Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-06-24 10:00:43 +02:00
lenz@mysql.com
5d515df476 - reverted to using the shell version of mysql-test-run for "make test" until the
remaining bugs in the Perl version have been resolved
2005-06-23 19:03:55 +02:00
svoj@mysql.com
367017d630 WL#2286 - Compile MySQL w/YASSL support
Fix for compilation failure with Forte Developer C++.
2005-06-23 21:29:44 +05:00
kent@mysql.com
ffff7cb314 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-06-23 17:41:42 +02:00
kent@mysql.com
025305c1cd mysql-test-run.pl:
Might need a restart after test with special TZ
  Removed unused argument to run_mysqltest()
2005-06-23 17:38:40 +02:00
svoj@mysql.com
b720c6e535 WL#2286 - Compile MySQL w/YASSL support
Fix for "multiple definition of __cxa_pure_virtual" link failure
when compiling with icc.
2005-06-23 16:04:10 +05:00
lenz@mysql.com
a190236e0a Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0.8-clone
2005-06-23 11:41:01 +02:00
lenz@mysql.com
cacb7199d3 - manual merge of the new node names 2005-06-23 11:34:58 +02:00
lenz@mysql.com
03b128971e - fixed text file generation - the node names in the info page had changed 2005-06-23 11:30:40 +02:00
reggie@mdk10.(none)
98ddf74dd3 Merge mdk10.(none):/home/reggie/bk/bug9148
into mdk10.(none):/home/reggie/bk/mysql-5.0-base
2005-06-22 18:51:48 -05:00
evgen@moonbone.local
4ddc13af42 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/mysql-5.0-merge
2005-06-23 03:51:47 +04:00
evgen@moonbone.local
dc65464688 insert_update.result, insert_update.test, sql_base.cc:
Fix for bugfix #9728 merge
2005-06-23 03:51:10 +04:00
evgen@moonbone.local
5c8e3341d3 Bug #9728 fix merge 2005-06-23 01:02:43 +04:00
patg@radha.local
7f5d7d47b3 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into radha.local:/Volumes/disk2s1/mysql-5.0
2005-06-22 21:23:33 +02:00
konstantin@mysql.com
6a0adade83 Remove THD::stmt_backup 2005-06-22 23:12:25 +04:00
reggie@mdk10.(none)
705992719a Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/bug9148
2005-06-22 13:59:32 -05:00
evgen@moonbone.local
54d3b00184 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into moonbone.local:/work/mysql-4.1-bug-8147
2005-06-22 22:59:31 +04:00
evgen@moonbone.local
6b9df50c5e item.h:
Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
  Have to return false to set flag for whole expression.
2005-06-22 22:58:44 +04:00
patg@radha.local
144045ffae Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into radha.local:/Volumes/disk2s1/mysql-5.0
2005-06-22 19:40:46 +02:00
patg@radha.local
172dab875b Bug# 9926, This is the same as changeset 1.1934, which was approved by Monty 2005-06-22 19:29:34 +02:00
kent@mysql.com
0c72aa5ef2 mtr_cases.pl:
Add a slave when running the federated test case
2005-06-22 19:07:34 +02:00
elliot@mysql.com
bafab2dd6f Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-06-22 13:07:33 -04:00
elliot@mysql.com
0f92a2cfd6 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-06-22 13:07:32 -04:00
kent@mysql.com
35c939d3c4 mysql-test-run.pl:
Bug#11481, set charset directory to mysqlbinlog
2005-06-22 19:07:31 +02:00
elliot@mysql.com
776fc4364f Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1-merge2
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-06-22 13:07:31 -04:00
kent@mysql.com
c4fe91b7da Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-06-22 19:07:30 +02:00
elliot@mysql.com
7ddb53c9c4 Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-06-22 13:07:30 -04:00
sergefp@mysql.com
7e7987eed9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8441
2005-06-22 19:07:29 +02:00
elliot@mysql.com
201f3a7865 Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1-merge
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
2005-06-22 13:07:29 -04:00
evgen@moonbone.local
473d7d59a7 Fix for bug #10886 merge 2005-06-22 21:07:28 +04:00
sergefp@mysql.com
aef810cbba Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/psergey/mysql-5.0-bug8441
2005-06-22 17:34:15 +02:00
svoj@mysql.com
1b59ffb8a8 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/mnt/archive/svoj/mysql/mysql-5.0
2005-06-22 17:17:40 +05:00
svoj@mysql.com
c275bde204 Better AR guessing. 2005-06-22 16:29:21 +05:00
marko@hundin.mysql.fi
2af4f441fe Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-06-22 13:40:31 +03:00
konstantin@mysql.com
8b9bf75740 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-10736-new
2005-06-22 14:40:30 +04:00
lenz@mysql.com
819fc8dd1f Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-06-22 12:38:38 +02:00
svoj@mysql.com
975cbd82c0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-22 15:11:07 +05:00
svoj@mysql.com
55ae33e8f4 Better comment. 2005-06-22 15:10:12 +05:00
konstantin@mysql.com
dc7aa03ece Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-10736-new
2005-06-22 14:00:22 +04:00
mskold@mysql.com
18804df51e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-06-22 11:51:18 +02:00
marko@hundin.mysql.fi
5f2ddcf580 InnoDB: Remove compilation warnings and errors on SGI IRIX. 2005-06-22 12:51:00 +03:00
marko@hundin.mysql.fi
eb42421e4a InnoDB: Replace for loops with memset() where possible. 2005-06-22 12:36:24 +03:00
marko@hundin.mysql.fi
3427c3304c Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/mysql-5.0-current
2005-06-22 12:36:23 +03:00
mskold@mysql.com
894390c109 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-06-22 11:36:22 +02:00
mskold@mysql.com
09d17627fd Made upgrade compatibility in 5.0 range to latest build version 2005-06-22 11:34:04 +02:00
mskold@mysql.com
c8398bcd2b Made upgrade compatibility in 4.1 range to latest build version 2005-06-22 11:18:40 +02:00
svoj@mysql.com
a8bcb25eda Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-22 14:11:23 +05:00
svoj@mysql.com
74373e7d54 WL#2286 - Compile MySQL w/YASSL support
Fix GCC 4.0 link failure.
Better CXX_VERSION guessing.
2005-06-22 14:08:28 +05:00
marko@hundin.mysql.fi
94b1429459 InnoDB: Correct a function comment. 2005-06-22 12:02:31 +03:00