Commit graph

31005 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
46620c4ab9 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-18 16:20:14 +01:00
msvensson@neptunus.(none)
e592227529 Fix build failure 2006-02-18 16:18:51 +01:00
petr@mysql.com
d6a36615d6 Merge mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
into  mysql.com:/home/cps/mysql/trees/5.1/5.1-virgin-debug
2006-02-18 18:00:22 +03:00
kent@mysql.com
a50023d772 mysqlimport.c:
Handle case where there is no snprintf()
libmysql.vcproj, mysqlclient.vcproj:
  Added __WIN__ symbol, needed when compiling dbug.c
dbug.vcproj:
  Changed __WIN32__ to __WIN__
dbug.c:
  Added Windows specific code to handle TIMESTAMP_ON log line format
make_win_src_distribution.sh:
  Copy plugin directory recursively
dbug.vcproj:
  Define __WIN__ for all targets
2006-02-18 08:46:18 +01:00
pekka@mysql.com
69d7e4f0ae Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-18 05:17:10 +01:00
kent@mysql.com
9aca849da1 Makefile.am:
Add an extra -lpthread before first -lc, to solve link
  problems when statically linking with glibc 2.2.5
make_win_src_distribution.sh:
  Added copying of the include/mysql directory
2006-02-18 04:23:24 +01:00
petr@mysql.com
cb74e09f46 Add a shift in the parser. Forgotten in the previous commit. 2006-02-18 03:22:13 +03:00
brian@zim.tangent.org
e4ce125d79 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.tangent.org:/home/brian/mysql/dep-5.1
2006-02-17 16:06:08 -08:00
brian@zim.tangent.org
3ea4f67f5b Removing support for storage engines being loadable, will push featureto 5.2. 2006-02-17 16:00:36 -08:00
petr@mysql.com
db7b6ef56f Merge mysql.com:/home/cps/mysql/trees/5.0/mysql-5.0-virgin-debug
into  mysql.com:/home/cps/mysql/devel/im/5.0-im-add-error-message
2006-02-18 02:50:50 +03:00
jimw@mysql.com
5659853f3c Fix results due to change in SHOW CREATE TABLE output 2006-02-17 14:41:57 -08:00
pekka@mysql.com
7827a89814 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-02-17 22:35:53 +01:00
pekka@mysql.com
6cfe04630b ndb - rbr blobs: fixes (not final) 2006-02-17 22:33:31 +01:00
kent@mysql.com
c56a4b1eb6 mysql-test-run.sh:
Set the ndbcluster slave port (bug#16780)
disabled.def:
  Disabled 'mysqldump' until bug 17443 is closed
2006-02-17 21:55:27 +01:00
jimw@mysql.com
4d483fa2d1 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-17 12:42:08 -08:00
elliot@mysql.com
649d64d7f9 BUG#17385 Re-enabling test case as it passes now. Wrong results were
corrected by Ingo when pushing WL#1563
2006-02-17 15:01:27 -05:00
jimw@mysql.com
cdad081fbe Merge mysql.com:/home/jimw/my/mysql-5.1-13883
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-17 11:06:05 -08:00
jimw@mysql.com
bf0b775859 Merge mysql.com:/home/jimw/my/mysql-5.0-7955
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-17 11:03:34 -08:00
jimw@mysql.com
30c343a04e Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-17 10:59:47 -08:00
jimw@mysql.com
10b96ec4c8 Merge mysql.com:/home/jimw/my/mysql-5.1-17169
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-02-17 10:55:43 -08:00
kent@mysql.com
2056feb789 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-02-17 19:27:16 +01:00
kent@mysql.com
ed07bf13c6 mysqld.vcproj, mysqlserver.vcproj, libmysqld.vcproj:
Changed default server to include all engines except BDB
2006-02-17 19:24:47 +01:00
jimw@mysql.com
7182785f19 Fix subselect results (there was a bad merge when subselect test was disabled) 2006-02-17 10:02:59 -08:00
msvensson@neptunus.(none)
ace6f14267 Bug#17382 mysql-test-run mysqldump fails with mysqlimport: Error:client run out of memory
- Disable --use-threads option in 5.1.7
2006-02-17 18:19:29 +01:00
jimw@mysql.com
38aafce1ef Merge mysql.com:/home/jimw/my/mysql-5.0-14676
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-02-17 08:32:50 -08:00
msvensson@neptunus.(none)
b2a13dd760 Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-17 17:21:34 +01:00
msvensson@neptunus.(none)
a50d87da34 Fix after review 2006-02-17 17:16:18 +01:00
tomas@poseidon.ndb.mysql.com
9495f8c56a Bug #17210 Create temp table call to ha_ndbcluster::create_handler_files caused core
- do not try to create ndb temp tables even if default storage is ndb
2006-02-17 17:12:35 +01:00
kent@mysql.com
088bc804aa mysql.spec.sh:
Only install a subset of shared libraries created
2006-02-17 16:38:32 +01:00
kent@mysql.com
bfdb5e585d mysql-test-run.pl:
Added --comment=<string> option
2006-02-17 16:20:53 +01:00
msvensson@neptunus.(none)
7632371576 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-02-17 15:56:01 +01:00
msvensson@neptunus.(none)
e96353cf55 Bug#17382 mysql-test-run mysqldump fails with mysqlimport
- Remove global  MYSQL connection variable
2006-02-17 15:52:05 +01:00
paul@snake-hub.snake.net
b05dcd504c Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-17 08:41:10 -06:00
paul@snake-hub.snake.net
abe3dd2a7e Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2006-02-17 08:38:05 -06:00
paul@snake-hub.snake.net
3a9bfb00c8 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-17 08:33:47 -06:00
paul@snake-hub.snake.net
22f630f59a mysqlcheck.c:
Tweak --check-upgrade help text.
2006-02-17 08:32:52 -06:00
kent@mysql.com
03ecedcae8 configure.in:
Updated version number to 5.1.8
2006-02-17 14:54:06 +01:00
joerg@mysql.com
0611ea3222 Surprising change: "mysqld-max" is resurrected in 5.1, but in a common package. 2006-02-17 14:14:56 +01:00
paul@snake-hub.snake.net
8a231241eb Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
2006-02-17 07:10:55 -06:00
bar@mysql.com
9d9dcf81b8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.16234
2006-02-17 16:39:42 +04:00
evgen@moonbone.local
e115d605de Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/15706-bug-5.0-mysql
2006-02-17 15:36:56 +03:00
pekka@mysql.com
5007310de2 ndb - rbr blobs: remove obsolete problem-causing temporary fix 2006-02-17 11:53:39 +01:00
holyfoot@mysql.com
0841480e1e merging 2006-02-17 14:39:38 +04:00
bar@mysql.com
5f7cca2e46 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.16234
2006-02-17 13:38:01 +04:00
holyfoot@deer.(none)
942503927a WL#2645 (CHECK FOR UPGRADE)
5.1-related fixes
2006-02-17 13:37:37 +04:00
bar@mysql.com
54009d973a upgrade.result, upgrade.test:
new file:
  Adding a test case for "Migration tool for 5.1 table name encoding"
2006-02-17 13:19:26 +04:00
bar@mysql.com
d0e4df18e6 client_priv.h:
Sorry, forgot to push in the previous changeset.
2006-02-17 13:10:12 +04:00
bar@mysql.com
ed4f5ac923 mysqlcheck.c:
WL#3046  Migration tool for 5.1 table-name encoding
2006-02-17 12:10:36 +04:00
tomas@poseidon.ndb.mysql.com
bd690b5e17 reported bugs and disabled corresponding tests
disabled non deterministic test
2006-02-17 09:02:11 +01:00
holyfoot@mysql.com
be02944df6 Merging 5.0->5.1 2006-02-17 11:26:03 +04:00