Commit graph

33527 commits

Author SHA1 Message Date
joerg@trift2.
3406fcea39 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  trift2.:/MySQL/M50/push-5.0
2006-11-28 18:45:10 +01:00
joerg@trift2.
3680ba8706 Merge trift2.:/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-11-28 18:39:17 +01:00
joerg@trift2.
648e86e108 netware/BUILD/nwbootstrap : Editing "mwenv" is now obsolete and even plain wrong - drop it. 2006-11-28 18:36:53 +01:00
kent@mysql.com/kent-amd64.(none)
de6eb0afb2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-28 18:11:21 +01:00
kent@mysql.com/kent-amd64.(none)
d3f73f27fa Makefile.am:
Handle the case "sql_yacc.cc" is pregenerated or not, and that the
  case where the source and build tree is the same or not.
2006-11-28 18:08:30 +01:00
kent@mysql.com/kent-amd64.(none)
d9e0763cba Merge mysql.com:/home/kent/bk/mysql-4.1-build
into  mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-28 18:07:50 +01:00
kent@mysql.com/kent-amd64.(none)
08e0e06eab Makefile.am:
If using \$(srcdir)/mysql.info in action, use same in rule.
2006-11-28 18:04:10 +01:00
joerg@trift2.
dd97e53171 Merge trift2.:/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-11-28 13:03:32 +01:00
kent@mysql.com/kent-amd64.(none)
ae605ec9d8 Merge mysql.com:/home/kent/bk/mysql-4.1-build
into  mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-28 00:42:41 +01:00
kent@mysql.com/kent-amd64.(none)
029dbbc2b2 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/kent/bk/mysql-5.0-merge
2006-11-27 21:45:16 +01:00
kent@mysql.com/kent-amd64.(none)
12c3e410d4 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/kent/bk/mysql-4.1-merge
2006-11-27 21:38:53 +01:00
kent@mysql.com/kent-amd64.(none)
5fcb7a4ef1 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.0
2006-11-27 21:21:00 +01:00
kent@mysql.com/kent-amd64.(none)
1b61612f86 ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4:
Reenabled build outside source tree
2006-11-27 21:15:25 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
c48c8e9015 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into  mysql.com:/Users/kent/mysql/bk/build/mysql-5.0-build
2006-11-27 19:09:21 +01:00
kent@mysql.com/kent-amd64.(none)
27ead71f12 Merge mysql.com:/home/kent/bk/mysql-4.1
into  mysql.com:/home/kent/bk/mysql-5.0
2006-11-27 19:06:24 +01:00
kent@mysql.com/kent-amd64.(none)
b7e107bf2d Makefile.am:
BSD compatibility
2006-11-27 19:04:57 +01:00
kent@mysql.com/kent-amd64.(none)
cbe9d22927 Merge mysql.com:/home/kent/bk/mysql-4.1
into  mysql.com:/home/kent/bk/mysql-5.0
2006-11-27 18:47:07 +01:00
kent@mysql.com/kent-amd64.(none)
6c85ba399d gen_rec.awk:
Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree
2006-11-27 18:29:50 +01:00
gkodinov@dl145s.mysql.com
e74c9add47 Merge bk-internal:/home/bk/mysql-5.0
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-11-27 16:25:52 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
9d328d7d62 mysql-test-run.pl:
Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".
mtr_report.pl:
  Don't try output "skipped" comment if there is none (bug#24471)
2006-11-24 18:26:53 +01:00
df@kahlann.erinye.com
728357200c Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2006-11-24 15:36:51 +01:00
df@kahlann.erinye.com
34cedd8d77 fixes for mtr_unique.pl 2006-11-24 15:36:04 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
35cfb3876d Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2006-11-23 20:08:12 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f1ec3372be Many files:
Adjuster project files to reflect move of "mySTL" directory
2006-11-23 20:04:18 +01:00
monty@mysql.com/nosik.monty.fi
501333f694 Added option --mtr-build-thread to mysql-test-run.pl
Load shared libraries from zlib (fixed that mysql-test-run.pl didn't work on some Solaris boxes)
Added connect timeout to test to make im_daemon_life_cycle more predictable
2006-11-23 18:39:10 +02:00
monty@mysql.com/nosik.monty.fi
fb9bb62b1e Added some missing DBUG_RETURN
Fixed that --valgrind works again with mysql-test-run.sh
Extended error messages when loosing connection during mysql_real_connect()
2006-11-23 16:41:21 +02:00
msvensson@neptunus.(none)
bc59087a9a Add define for my_getpagesize to 8192(reworked in 5.0) 2006-11-23 12:06:04 +01:00
msvensson@neptunus.(none)
2aa0d085e3 Build fixes for NetWare 2006-11-23 11:38:44 +01:00
msvensson@neptunus.(none)
8e6cf24d3b Fix my_system_gmt_sec function declaration to be same as definition 2006-11-23 09:56:50 +01:00
sergefp@mysql.com
0421d489fb Fix typo in comment 2006-11-21 21:52:39 +03:00
gluh@mysql.com/gluh.(none)
ff38409128 Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash
disable filling of I_S tables for EXPLAIN
2006-11-21 13:45:01 +04:00
monty@mysql.com/nosik.monty.fi
306b871d52 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0
2006-11-20 22:46:52 +02:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
2006-11-20 22:42:06 +02:00
msvensson@neptunus.(none)
8809a5e27e mysql_client_test not found when running from binary dist
Look in bin for myql_client_test executable
2006-11-20 13:02:49 +01:00
holyfoot/hf@mysql.com/deer.(none)
bcfed657e7 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  mysql.com:/home/hf/work/mysql-5.0-mrg
2006-11-19 22:16:13 +04:00
holyfoot/hf@mysql.com/deer.(none)
dbda18e9df Merge mysql.com:/home/hf/work/mysql-4.1-mrg
into  mysql.com:/home/hf/work/mysql-5.0-mrg
2006-11-19 20:48:26 +04:00
dfischer/df@kahlann.erinye.com
bc8c59c1a8 adaption from 4.1 2006-11-17 17:02:28 +01:00
dfischer/df@kahlann.erinye.com
88ac15ddd1 MTR_BUILD_THREAD=auto selects a value for MTR_BUILD_THREAD from a pool (WL#2690) 2006-11-17 16:52:21 +01:00
joerg@trift2.
f9e9ce60e8 Merge trift2.:/MySQL/M50/yassl-win-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-11-17 16:30:08 +01:00
joerg@trift2.
0aee63517e Maintain the (old) VC project files, ehere yaSSL is concerned:
"mySTL" has become a subdirectory of "taocrypt", was a sibling previously.
2006-11-17 16:09:37 +01:00
holyfoot/hf@mysql.com/deer.(none)
5906c3868f ABI fix 2006-11-17 14:30:08 +04:00
holyfoot/hf@mysql.com/deer.(none)
dac2d0fcba merging 2006-11-17 12:02:36 +04:00
holyfoot/hf@mysql.com/deer.(none)
950665fc3b merging 2006-11-17 11:15:40 +04:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3 Merge bk@192.168.21.1:mysql-5.0-opt
into  mysql.com:/home/hf/work/mysql-5.0-0mrg
2006-11-17 10:30:16 +04:00
joerg@trift2.
7ede3508c8 Merge trift2.:/MySQL/M41/push-4.1
into  trift2.:/MySQL/M50/push-5.0
2006-11-16 21:07:08 +01:00
joerg@trift2.
3a12df0bb9 Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2006-11-16 21:04:01 +01:00
joerg@trift2.
aa5b64f98b Merge trift2.:/MySQL/M50/tmp-5.0
into  trift2.:/MySQL/M50/push-5.0
2006-11-16 21:01:52 +01:00
holyfoot/hf@mysql.com/deer.(none)
497ccd6b87 Merge mysql.com:/home/hf/work/mysql-4.1-mrg
into  mysql.com:/home/hf/work/mysql-5.0-mrg
2006-11-16 23:16:44 +04:00
holyfoot/hf@mysql.com/deer.(none)
e7cde72651 merging 2006-11-16 23:00:48 +04:00
holyfoot/hf@mysql.com/deer.(none)
2963d8ddd2 merging 2006-11-16 21:23:34 +04:00