Commit graph

16927 commits

Author SHA1 Message Date
unknown
56b1a85469 A fix (Bug #8015: server refuses to start with long basedir path). 2005-01-21 17:51:24 +04:00
unknown
aea5775c56 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-20 14:16:29 +01:00
unknown
aa2eb4e009 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-20 12:40:42 +01:00
unknown
9241e34593 item_cmpfunc.cc:
Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.


sql/item_cmpfunc.cc:
  Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.
2005-01-20 15:38:56 +04:00
unknown
d07dc11fa4 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 12:27:33 +01:00
unknown
877ed48b3d bug#8010 - ndb
release connections when last op was simple read


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  bug#8010
    release connections when last op was simple read
2005-01-20 12:19:48 +01:00
unknown
933d80d4ff Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-01-20 12:09:17 +01:00
unknown
89a24f9335 - Improved Do-rpm to perform RPM builds inside of a chrooted build
environment (using "build" on SUSE Linux)


Build-tools/Do-rpm:
  - added functionality to perform RPM builds inside of a chrooted build
    environment (using "build" on SUSE Linux) - see "--help" for more details
2005-01-20 12:07:44 +01:00
unknown
af23c2b34a Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-20 10:47:42 +01:00
unknown
25d215aa24 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 10:12:26 +01:00
unknown
a242d57436 errmsg.txt:
Minor fix after character set conversion.


sql/share/japanese-sjis/errmsg.txt:
  Minor fix after character set conversion.
2005-01-20 13:08:16 +04:00
unknown
118a85563c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-20 09:53:29 +01:00
unknown
026bf61e99 configure.in:
Add SJIS version of Japanese error messages.
  Windows version should include this new file,
  instead of the EUC-JP version.


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
unknown
41e6f84d8a errmsg.txt:
new file
2005-01-20 12:37:02 +04:00
unknown
c8343423c2 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
unknown
fa0935dead 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
unknown
98713d6482 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.)


BUILD/compile-amd64-max:
  use $max_cflags
BUILD/compile-pentium-debug-max:
  use $max_cflags
BUILD/compile-pentium-debug-max-no-embedded:
  use $max_cflags
BUILD/compile-pentium-max:
  use $max_cflags
BUILD/compile-pentium-valgrind-max:
  use $max_cflags
BUILD/compile-ppc-debug-max:
  use $max_cflags
BUILD/compile-ppc-max:
  use $max_cflags
BUILD/compile-amd64-debug-max:
  use $max_cflags, remove unnecessary base_cxxflags stuff
2005-01-19 10:24:51 -08:00
unknown
4bd96dd11d ndb - make sure scan recevier pointers are aligned
ndb/src/ndbapi/NdbScanOperation.cpp:
  align pointers
2005-01-19 18:32:34 +01:00
unknown
f321a60b97 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-19 14:07:00 +01:00
unknown
7893b8dfaa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-19 10:07:13 +01:00
unknown
49ab428c8d 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
unknown
d374ed9c04 added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-run 2005-01-19 10:00:41 +01:00
unknown
ed327104b6 bug#7777 - ndb compile on qnx
remove usage of compiler supplied <new> and instead
  impl. own inlined placement new


ndb/include/kernel/AttributeHeader.hpp:
  remove usage <new>
ndb/include/ndb_global.h.in:
  remove usage <new>
  instead impl. own
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove usage <new>
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  remove usage <new>
ndb/src/kernel/blocks/grep/GrepInit.cpp:
  remove usage <new>
ndb/src/kernel/blocks/suma/SumaInit.cpp:
  remove usage <new>
ndb/src/kernel/vm/Emulator.cpp:
  remove usage <new>
ndb/src/kernel/vm/SimulatedBlock.hpp:
  remove usage <new>
ndb/src/mgmapi/mgmapi_configuration.cpp:
  remove usage <new>
2005-01-19 09:15:34 +01:00
unknown
153160d1ff bug#7693 - ndb
when using shm transporter, set sigmask on each thread using pthread_sigmask


configure.in:
  Add more functions needed for SHM
ndb/src/common/portlib/NdbThread.c:
  1) Create thread wrapper function
  2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
ndb/src/common/transporter/TransporterRegistry.cpp:
  (un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
sql/ha_ndbcluster.cc:
  cast pointer to UintPtr before printout
2005-01-19 07:23:20 +01:00
unknown
d2778647ae 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
unknown
b697b6c0e0 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
unknown
59ef5bede9 fixing wrong value for "examined rows" when UNION's are used.
mysql-test/r/union.result:
  result for a test case for the wrong examined rows with UNION's
mysql-test/t/union.test:
  test case for the wrong examined rows with UNION's
sql/sql_union.cc:
  a patch for the wrong examined rows with UNION's
2005-01-18 23:13:29 +02:00
unknown
08ea4df60b Update type_float test results after merge.
mysql-test/r/type_float.result:
  Update test results (4.1 produces a warning that 4.0 did not,
  and they were merged into the wrong position).
2005-01-18 13:12:40 -08:00
unknown
34eff3c453 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
unknown
8e5a74a6b6 Merge changed tests
sql/field_conv.cc:
  Auto merged
mysql-test/r/type_float.result:
  Merge
mysql-test/t/type_float.test:
  Merge
2005-01-18 12:25:56 -08:00
unknown
803774958c 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
unknown
ca252acbcd 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
unknown
c148946d03 - small improvement for the logrotate config file (patch found in the SUSE
source RPM): use "mysqladmin ping" instead of grepping the process list 
  for the mysqld binary (should be more portable than relying on the "ps"
  options


support-files/mysql-log-rotate.sh:
  - small improvement (patch found in the SUSE source RPM): use "mysqladmin ping"
    instead of grepping the process list for the mysqld binary (should be more
    portable than relying on the "ps" options
2005-01-18 17:35:32 +01:00
unknown
e2c869f2ff Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
prefix", which roots were fixed in 4.0 tree.


mysql-test/r/alter_table.result:
  Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
  prefix".
mysql-test/t/alter_table.test:
  Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
  prefix".
2005-01-18 17:45:49 +03:00
unknown
2e50981af9 Fix for BUG#7885
mysql-test/r/subselect.result:
  Testcase for BUG#7885
mysql-test/t/subselect.test:
  Testcase for BUG#7885
sql/item_subselect.cc:
  Fix for BUG#7885: In Item_subselect::fix_fields, return error if engine->prepare fails.
  Also removed redundant code line.
2005-01-18 17:26:05 +03:00
unknown
e46d235a08 Cleanups in Makefile.ams
client/Makefile.am:
  Remove  explicit _DEPENDENCIES, they are not needed with automatic
   dependency tracking wich we started using several months ago.
  Don't use relative paths in makefiles.
regex/Makefile.am:
  Remove  explicit _DEPENDENCIES, they are not needed with automatic
   dependency tracking wich we started using several months ago.
  Don't use relative paths.
strings/Makefile.am:
  Remove dead rule.
2005-01-18 17:26:04 +03:00
unknown
9474fed704 Manual merge of fix for bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix" into 4.1 tree.


sql/field.h:
  Manual merge.
2005-01-18 17:23:46 +03:00
unknown
9ed0d85550 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg7884
2005-01-18 17:05:09 +03:00
unknown
b1a0f67a03 Clean up in implementation of f_is_geom()/f_is_bitfield()/f_is_enum()
macros.

It does not fixes any bugs in 4.0. But it prevents from future error in
any bugfixes that may use these macros. Also after merging into 4.1 tree
this cleanup will fix bug #7884 "Able to add invalid unique index on
TIMESTAMP prefix".


sql/field.h:
  Since FIELDFLAG_INTERVAL, FIELDFLAG_BITFIELD, FIELDFLAG_BLOB and
  FIELDFLAG_GEOM flags occupy the same space as number of decimals for
  FIELDFLAG_NUMBER fields, it is safer to check in "f_is_geom()"-type
  macros that we have non-number field, like we already do in f_is_blob()
  macro.
2005-01-18 17:04:16 +03:00
unknown
cd89ed9ab6 1. Item now uses my_charset_bin by default,
not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.


mysql-test/r/analyse.result:
  SELECT PROCEDURE ANALIZE now returns
  BINARY columns, which is much better than it worked
  previously: CHAR with the default character set.
  But in the future it's worth to fix the fields
  'Field_name' and 'Optimal_fieldtype' to use UTF8,
  and 'Min_value' and 'Max_value' to inherit their charsets
  from the original items. But it is not important,
  and BINARY(N) is OK for now.
mysql-test/r/case.result:
  Test fix according to the changes
mysql-test/r/metadata.result:
  Test fix according to the changes
mysql-test/r/ps_1general.result:
  Test fix according to the changes
mysql-test/r/ps_2myisam.result:
  Test fix according to the changes
mysql-test/r/ps_3innodb.result:
  Test fix according to the changes
mysql-test/r/ps_4heap.result:
  Test fix according to the changes
mysql-test/r/ps_5merge.result:
  Test fix according to the changes
mysql-test/r/ps_6bdb.result:
  Test fix according to the changes
mysql-test/r/ps_7ndb.result:
  Test fix according to the changes
mysql-test/r/union.result:
  Test fix according to the changes
sql/item.cc:
  Item is now BINARY by default
sql/item_cmpfunc.cc:
  IFNULL now collects arguments collations/charsets
  like other functions do.
2005-01-18 17:41:06 +04:00
unknown
1457163c97 Fix 'make distclean' goal. 2005-01-18 16:23:10 +03:00
unknown
381659fff5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-18 14:07:47 +01:00
unknown
7f4bb64a75 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2005-01-18 12:10:11 +01:00
unknown
2c6b02ca32 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-01-18 11:41:51 +01:00
unknown
813e748d4f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-18 10:24:25 +01:00
unknown
ec0daa744f #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals
We should not overwrite res if it is returned from a const item.
2005-01-18 10:42:29 +04:00
unknown
985805ce6a Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1
sql/filesort.cc:
  Auto merged
2005-01-18 03:52:15 +02:00
unknown
96f64b4440 Fixed new bug that caused symlink test to fail
mysys/my_symlink.c:
  More debugging
2005-01-18 03:49:39 +02:00
unknown
dd68385435 Fix over-optimization that could result in an unsigned double field being
set to a negative value. (Bug #7700)


sql/field_conv.cc:
  Don't treat real fields as identical when destination is unsigned and
  the source is not.
mysql-test/t/type_float.test:
  Add test for setting double unsigned to a negative value from a signed double
mysql-test/r/type_float.result:
  Add test results
2005-01-17 16:13:56 -08:00
unknown
896cdbe5df Anoter fix for moved IO_CACHE object 2005-01-18 02:04:41 +02:00