kent@mysql.com/kent-amd64.(none)
18acdc7581
make_binary_distribution.sh:
...
Use 'make install' to create the package
Makefile.am:
Added 'pkgsuppdir' to control location separately
Pass on mandir and infodir
Don't install headers
2007-09-26 20:19:33 +02:00
omer@linux.site
6e06cb855f
Updated to result files for cluster tests for version 5.1.21
...
Updared to 'views' test - forcing sort order
Updateds included masked results as a result of bug 30322
2007-08-08 17:16:26 -07:00
joerg@trift2.
3340659c21
Merge trift2.:/MySQL/M51/clone-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-08-08 16:34:43 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
283e9529fc
BUG#30274 (Debug server crashes because mutex isn't initialized):
...
Completion patch, since it is possible that Log_event::write_header()
is called with no current thread.
When starting the server, there is no thread available, but
MYSQL_BIN_LOG::open() is called to initialize the binary log. The
function writes a format description log event to the binary log,
which means that Log_event::write_header() can be called with no
current thread object available.
2007-08-08 16:50:43 +03:00
joerg@trift2.
b8eadebf4f
Merge trift2.:/MySQL/M51/clone-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-08-07 23:00:34 +02:00
joerg@trift2.
55d3781dfe
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into trift2.:/MySQL/M51/push-5.1
2007-08-07 22:57:45 +02:00
joerg@trift2.
c664a34098
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-08-07 22:54:09 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
c8dc63b363
Removed wrong call to my_time(), before my_init() has been called.
2007-08-07 23:20:21 +03:00
jani@a88-113-38-195.elisa-laajakaista.fi
23fd74961d
Removed a wrong call to my_time() before my_init() has been called.
...
Fix for Bug#30274 "Debug server crashes because mutex isn't initialized"
2007-08-07 22:54:42 +03:00
joerg@trift2.
70d937ace4
Merge trift2.:/MySQL/M51/push-5.1
...
into trift2.:/MySQL/M51/clone-5.1
2007-08-07 15:21:32 +02:00
omer@linux.site
36ff199535
Updated funcs_1 test and result files (not including cluster) for 5.1.21
2007-08-06 18:46:00 -07:00
kent@mysql.com/kent-amd64.(none)
413d1e1aa4
CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:
...
Additional changes for bug#29903
- Changed to do embedded build part as normal build, when
WITH_EMBEDDED_SERVER is set.
- Allow both normal and debug build with embedded.
- Build static embedded library by pointing out all source and compile
it all, i.e. not building libraries from libraries, not portable.
- Let embedded use generated files from the "sql" directory, added
dependencies to make sure built before embedded.
- Mark library "dbug" in TARGET_LINK_LIBRARIES() with "debug", so only
linked in when debug target is used.
- Removed change of target name with "mysqld${MYSQLD_EXE_SUFFIX}", as
others can't depend on it, not defined at configure time. Instead
set the output file name.
- Created work around for bug in CMake 2.4.6 and output names, to
set the "mysqld<suffix>.pdb" name to the same base name.
- Set the correct manifest "name" (patch by iggy)
2007-08-06 23:16:01 +02:00
jbruehe/mysqldev@mysql.com/production.mysql.com
0afb19f555
Raise version number after cloning 5.1.21-beta
2007-08-06 21:11:09 +02:00
kent@kent-amd64.(none)
add9cb76b5
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
...
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-06 08:33:20 +02:00
kent@mysql.com/kent-amd64.(none)
d75c7a58c1
make_win_bin_dist:
...
Corrected install path
2007-08-06 08:31:09 +02:00
kent@mysql.com/kent-amd64.(none)
f9fdd5ae8c
make_win_bin_dist:
...
Copy embedded .pdb and static debug lib
2007-08-06 08:28:16 +02:00
kent@kent-amd64.(none)
0065e85e32
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
...
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-06 01:35:43 +02:00
kent@mysql.com/kent-amd64.(none)
6ab4112c37
mysql-test-run.pl:
...
Search "relwithdebinfo" directory in CMake Visual Studio build
Search for "mysqld-debug" even in source tree
2007-08-06 01:29:53 +02:00
df@pippilotta.erinye.com
239f6aa312
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-08-05 16:43:03 +02:00
df@pippilotta.erinye.com
17e76114c9
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-08-05 16:37:34 +02:00
df@pippilotta.erinye.com
0285a32afb
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
2007-08-05 16:37:20 +02:00
df@pippilotta.erinye.com
f0f9652988
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-08-04 11:08:11 +02:00
df@pippilotta.erinye.com
ec7dccce7f
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
2007-08-04 09:55:45 +02:00
iggy@amd64.(none)
b880985ea7
Post Merge Fixup.
2007-08-04 02:51:58 -04:00
iggy@amd64.(none)
64b6c61108
Merge amd64.(none):/src/mysql-5.1-maint
...
into amd64.(none):/src/mysql-5.1-build_29903
2007-08-03 21:44:59 -04:00
cbell/Chuck@mysql_cab_desk.
3b39789e4e
Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl-push
...
into mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
2007-08-03 21:43:25 -04:00
iggy@amd64.(none)
171f402ad4
Bug#29903 The CMake build method does not produce the embedded library.
...
- GCov fix.
2007-08-03 21:08:48 -04:00
iggy@amd64.(none)
35b1a59841
Bug#29903 The CMake build method does not produce the embedded library.
...
- Additional changes to correct link failure in Do-linkall script.
2007-08-03 18:56:24 -04:00
df@pippilotta.erinye.com
db15f4daeb
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-08-04 00:46:33 +02:00
df@pippilotta.erinye.com
d268c7e0fc
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-08-04 00:44:51 +02:00
kent@kent-amd64.(none)
405522690d
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
...
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-04 00:29:47 +02:00
kent@mysql.com/kent-amd64.(none)
abf4895367
CMakeLists.txt:
...
Removed space between '-D' and symbol
2007-08-04 00:26:46 +02:00
kent@kent-amd64.(none)
6b9ac5b7cf
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
...
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
2007-08-03 22:57:21 +02:00
df@pippilotta.erinye.com
eba0752b45
after-merge fix
2007-08-03 22:02:19 +02:00
kent@mysql.com/kent-amd64.(none)
a6d082f36d
CMakeLists.txt, README, configure.js
...
Several adjustments to make client libraries pass the link test
on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
2007-08-03 21:51:37 +02:00
iggy@amd64.(none)
3ed9739c82
Bug#29903 The CMake build method does not produce the embedded library.
...
- Changes to correct and test Windows embedded build.
2007-08-03 14:43:12 -04:00
mkindahl@dl145h.mysql.com
92d4958eb7
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
2007-08-03 19:04:59 +02:00
mkindahl@dl145h.mysql.com
ea9848094a
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
2007-08-03 18:59:16 +02:00
df@pippilotta.erinye.com
7c29bcda22
merge fix
2007-08-03 18:57:18 +02:00
mkindahl@dl145h.mysql.com
efb82b3aac
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
2007-08-03 18:56:06 +02:00
dfischer@bk-internal.mysql.com
1230d8fb68
.del-readme.txt-grumble-grumble:
...
Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble
2007-08-03 18:31:54 +02:00
df@pippilotta.erinye.com
493634e4c7
Merge bk-internal:/home/bk/mysql-5.1-marvel
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
2007-08-03 17:15:23 +02:00
mkindahl@dl145h.mysql.com
6cc184aa1b
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
2007-08-03 17:14:46 +02:00
mkindahl@dl145h.mysql.com
008d2b2537
Fixes to eliminate valgrind warnings.
2007-08-03 17:12:00 +02:00
df@pippilotta.erinye.com
3d986fde8d
Merge bk-internal:/home/bk/mysql-5.1-engines
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
2007-08-03 16:53:06 +02:00
df@pippilotta.erinye.com
5ad3f6083e
add mysqlslap back to windows builds for 5.1
2007-08-03 14:43:11 +02:00
bar@bar.myoffice.izhnet.ru
fb8dff9721
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875
...
into mysql.com:/home/bar/mysql-work/mysql-5.1.b28875
2007-08-03 17:16:02 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
7754da28f9
After merge fix
2007-08-03 15:57:14 +05:00
bar@bar.myoffice.izhnet.ru
c01ce7b1e3
Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875
...
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
2007-08-03 15:30:31 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
4eebfd09c2
Bug#28875 Conversion between ASCII and LATIN1 charsets does not function
...
(Regression, caused by a patch for the bug 22646).
Problem: when result type of date_format() was changed from
binary string to character string, mixing date_format()
with a ascii column in CONCAT() stopped to work.
Fix:
- adding "repertoire" flag into DTCollation class,
to mark items which can return only pure ASCII strings.
- allow character set conversion from pure ASCII to other character sets.
2007-08-03 15:25:23 +05:00