Commit graph

18955 commits

Author SHA1 Message Date
bar@mysql.com
0afb9b244a configure.in:
Auto-merge fix:
  removing this file: error messages are done
  in a different way in 5.0.
.del-errmsg.txt~31abf77f9e7b9211:
  Delete: sql/share/japanese-sjis/errmsg.txt
2005-01-20 12:44:33 +04:00
bar@mysql.com
c1d40baf18 Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-20 12:42:08 +04:00
bar@mysql.com
d45e954801 configure.in:
Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.
2005-01-20 12:39:46 +04:00
bar@mysql.com
1650728655 errmsg.txt:
new file
2005-01-20 12:37:02 +04:00
sergefp@mysql.com
9a7a47c21c Merge mysql.com:/dbdata/psergey/mysql-4.1-bug7885
into mysql.com:/dbdata/psergey/mysql-5.0-bug7885
2005-01-19 23:11:50 +03:00
sergefp@mysql.com
b1c3e43060 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
2005-01-19 23:02:28 +03:00
jimw@mysql.com
c449637cea Merge mysql.com:/home/jimw/my/mysql-5.0-7632
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-19 11:19:21 -08:00
jimw@mysql.com
a4471236ec Build federated storage engine as part of max builds. 2005-01-19 10:40:39 -08:00
jimw@mysql.com
639ea64d96 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-19 10:27:18 -08:00
jimw@mysql.com
027d1ff19e Merge mysql.com:/home/jimw/my/mysql-4.1-build
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-19 10:26:03 -08:00
jimw@mysql.com
effec1490f Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do.
(Simpler fix than last commit -- no need to mess with base_cxxflags.)
2005-01-19 10:24:51 -08:00
jimw@mysql.com
3fd43fe2ff Merge mysql.com:/home/jimw/my/mysql-5.0-7920
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-19 07:52:02 -08:00
tulin@build.mysql.com
efd7420dd9 MgmtSrvr.cpp:
corrected erroneous comparison boolean < 0
2005-01-19 15:03:34 +01:00
tulin@build.mysql.com
113b322e37 removed compiler warnings 2005-01-19 14:56:40 +01:00
tulin@build.mysql.com
26d8fc4939 added configure option to set extra ndb cc-flags 2005-01-19 14:20:26 +01:00
gluh@gluh.mysql.r18.ru
c1b92f6a90 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-19 16:20:25 +03:00
gluh@gluh.mysql.r18.ru
994c1fd4d8 View field names should be case insensitive 2005-01-19 16:19:10 +03:00
tulin@build.mysql.com
cb995131fb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-5.0
2005-01-19 10:07:13 +01:00
tomas@poseidon.ndb.mysql.com
594ee4c018 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-19 10:07:12 +01:00
tomas@poseidon.ndb.mysql.com
2776424102 added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-run 2005-01-19 10:00:41 +01:00
joreland@mysql.com
18bd4a2513 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-19 07:34:57 +01:00
joreland@mysql.com
b0b8f9115a bug#7693 - ndb
when using shm transporter, set sigmask on each thread using pthread_sigmask
2005-01-19 07:23:20 +01:00
tomas@poseidon.ndb.mysql.com
f8a0287fac Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-19 04:44:45 +01:00
tomas@poseidon.ndb.mysql.com
05bc990045 changed "formatting" after sergs comments on prev chanset 2005-01-19 04:43:54 +01:00
jimw@mysql.com
d28f83359b Update list of files copied for binary distribution. (Bug #7632) 2005-01-18 17:01:06 -08:00
jimw@mysql.com
d5ee0a9e3a Add ha_federated.cc to libmysqld/Makefile.am so that configuring with both
embedded server and federated storage engine compiles. (Bug #7920)
2005-01-18 16:50:09 -08:00
konstantin@mysql.com
733db0e64d Fixes of client_test on Solaris 64 bit 2005-01-19 03:01:34 +03:00
jimw@mysql.com
20552486e5 Fix test results from merge, and fix the symlink test which had an
out-of-sync test and result.
2005-01-18 15:05:16 -08:00
jimw@mysql.com
1edf7279ef Merge from 4.1. 2005-01-18 13:59:55 -08:00
jimw@mysql.com
06f60f6d65 Merge bk-internal:/home/bk/mysql-4.1
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-18 13:34:22 -08:00
Sinisa@sinisa.nasamreza.org
a2e0ecbf03 after merge fixes 2005-01-18 23:34:15 +02:00
Sinisa@sinisa.nasamreza.org
08639a88b2 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2005-01-18 23:29:47 +02:00
tomas@poseidon.ndb.mysql.com
a7c56a858b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-18 22:25:19 +01:00
Sinisa@sinisa.nasamreza.org
477047401c fixing wrong value for "examined rows" when UNION's are used. 2005-01-18 23:13:29 +02:00
jimw@mysql.com
1ffa2a3dc4 Update type_float test results after merge. 2005-01-18 13:12:40 -08:00
tomas@poseidon.ndb.mysql.com
aabe11028a removed default usage of shared memory transporter as it is not verified on enough platforms 2005-01-18 22:09:15 +01:00
jimw@mysql.com
59ffad87cc Merge mysql.com:/home/jimw/my/mysql-4.1-6913
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-18 12:27:00 -08:00
jimw@mysql.com
2fac8bd044 Merge changed tests 2005-01-18 12:25:56 -08:00
jimw@mysql.com
bc35532bcc Merge mysql.com:/home/jimw/my/mysql-4.0-7700
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-01-18 11:39:10 -08:00
dlenev@brandersnatch.localdomain
e906e86121 After merge fix. 2005-01-18 22:24:22 +03:00
dlenev@mysql.com
5f21e5ac47 Merge mysql.com:/home/dlenev/src/mysql-4.1-merges
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-18 22:13:05 +03:00
dlenev@mysql.com
001aa1096f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-18 21:52:15 +03:00
dlenev@mysql.com
028ece5735 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-merges
2005-01-18 21:49:33 +03:00
bar@mysql.com
efe6ea9363 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0
2005-01-18 22:30:28 +04:00
bar@mysql.com
4438d2d569 ps_7ndb.result, ps_6bdb.result:
after merge clean-up
2005-01-18 22:29:21 +04:00
dlenev@mysql.com
af878017b2 Merge mysql.com:/home/dlenev/src/mysql-4.1-merges
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-18 21:27:09 +03:00
jani@ua141d10.elisa.omakaista.fi
04ee95729c Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-01-18 20:17:24 +02:00
jani@ua141d10.elisa.omakaista.fi
625ae2c5a0 Added possibility to use --error <name> instead of --error <number>
The old syntax works as well. WL#2356.
2005-01-18 20:16:21 +02:00
bar@mysql.com
05204a9b3c After-merge clean-up 2005-01-18 22:12:33 +04:00
bar@mysql.com
f93bfe06b3 merge 2005-01-18 21:38:40 +04:00