Commit graph

16958 commits

Author SHA1 Message Date
unknown
8bb9a5496e Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-13 15:41:21 +03:00
unknown
81a082075f - added the 4.0 shared mysqlclient libraries to the 4.1 "shared-compat" RPM 2005-01-13 13:07:35 +01:00
unknown
763d552689 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-dtbug
2005-01-13 14:46:41 +03:00
unknown
9edcc56cc8 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-13 11:34:12 +01:00
unknown
3eb2e7c8d2 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.0
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


scripts/mysqlaccess.sh:
  Auto merged
2005-01-13 11:12:00 +01:00
unknown
a2e905a5b7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-13 10:29:03 +01:00
unknown
fee822e41f bug#7864 - fix ndb limit 4.5G data memory due to truncation error
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  remove 8k->32k conversion
ndb/src/kernel/vm/Configuration.cpp:
  compute size in 32k pages directly
2005-01-13 10:28:26 +01:00
unknown
8191a28b97 libmysqld.def, libmysql.def:
Use the invisible tabs (!)


libmysql/libmysql.def:
  Use the invisible tabs (!)
libmysqld/libmysqld.def:
  Use the invisible tabs (!)
2005-01-12 21:04:31 -06:00
unknown
c26f341bb9 libmysqld.def, libmysql.def:
Add missing 'get_defaults_files' to fix linking error.


libmysql/libmysql.def:
  Add missing 'get_defaults_files' to fix linking error.
libmysqld/libmysqld.def:
  Add missing 'get_defaults_files' to fix linking error.
2005-01-12 19:56:49 -06:00
unknown
d74020eb39 Fix small memory leak that occured when BerkeleyDB failed to initialize.
sql/ha_berkeley.cc:
  Skip allocation of hash and lock on error
2005-01-12 17:20:43 -08:00
unknown
7682d6c9cf Small fix for Field_str::store() to avoid trying to read past beginning
of log_10 array.


sql/field.cc:
  Avoid pointless calculation for really short fields, and what could be
  an attempt to access outside the bounds of the log_10 array.
2005-01-13 00:52:19 +01:00
unknown
d62ca95951 Fix for BUG#7850: force the transaction isolation level to REPEATABLE READ when --single-transaction
client/mysqldump.c:
  force the transaction isolation level to REPEATABLE READ when --single-transaction
2005-01-13 00:44:13 +01:00
unknown
8b077c2b9f Fix conversion of floating point values to character fields when the
absolute value of the float is less than 1, and also fix calculation of
length for negative values. (Bug #7774)


sql/field.cc:
  Fix handling of negative values and fabs(values> < 1 in Field_str::store
mysql-test/r/type_float.result:
  Add results
mysql-test/r/type_float.result.es:
  Add results
mysql-test/t/type_float.test:
  Add test for conversion of floats to character field
2005-01-13 00:41:45 +01:00
unknown
069d260b0e Add logging of COM_EXECUTE in the general query log.
sql/sql_parse.cc:
  A shorter name for COM_EXECUTE command.
2005-01-13 02:13:19 +03:00
unknown
f247a0d515 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2005-01-12 23:31:31 +01:00
unknown
4bdf479da0 Symlink vulnerability fixed.
reported by Javier Fernandez-Sanguino Pena
and Debian Security Audit Team (http://www.debian.org/security/audit)
2005-01-12 23:30:54 +01:00
unknown
611fd7522c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-12 22:23:00 +01:00
unknown
ec459b583b Minor clean up.
mysql-test/t/analyse.test:
  Added a note about the bug that this test case tests.
sql/sql_analyse.cc:
  Changed function description to standard format.
2005-01-12 22:55:10 +02:00
unknown
053b7bf78f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-clean
2005-01-12 19:44:19 +01:00
unknown
f5d30e0cac Fix for BUG#7793 "mysqlbinlog produces incorrect queries":
when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)


mysql-test/r/ctype_ucs.result:
  backticks added
mysql-test/r/user_var.result:
  backticks added
mysql-test/t/user_var.test:
  testing a variable with BINARY collation, which needs the backticks
sql/log_event.cc:
  when printing SET @var in mysqlbinlog, backtick the collation (as BINARY is a reserved word)
2005-01-12 19:42:46 +01:00
unknown
3719265be7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1
2005-01-12 19:00:33 +01:00
unknown
a3d3aef157 A test case for Bug#6761 "mysql_list_fields doesn't work" 2005-01-12 20:28:31 +03:00
unknown
9c68ad228f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1
2005-01-12 18:20:16 +01:00
unknown
55ad8626c4 fix shm key 2005-01-12 18:19:30 +01:00
unknown
c1bc964a8e Merge mysql.com:/home/kostja/work/mysql-4.0-6761
into mysql.com:/home/kostja/work/mysql-4.1-root


sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2005-01-12 19:00:04 +03:00
unknown
b692ca4fd5 A fix for Bug#6761 "mysql_list_fields() does not work": test
case will be added to client_test in 4.1


sql/sql_parse.cc:
  A fix for bug #6761: "mysql_list_fields() does not work": init
  thd->query_length, which is used next line. Remove a stale comment.
2005-01-12 17:04:45 +03:00
unknown
c65c72f01a InnoDB: Use system-supplied tmpfile() on Netware, as there is no
open interface for setting the "delete-on-close" flag.


innobase/os/os0file.c:
  Use system-supplied tmpfile() on Netware
sql/ha_innodb.cc:
  Remove innobase_mysql_tmpfile() on Netware.
2005-01-12 15:24:49 +02:00
unknown
bbaa4ea8e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-01-12 13:27:15 +01:00
unknown
f7c3816c1d Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-01-12 14:23:23 +02:00
unknown
b895e87772 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1


innobase/include/row0mysql.h:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
2005-01-12 14:08:25 +02:00
unknown
e8e4861401 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-merge
2005-01-12 13:08:24 +01:00
unknown
d862f84643 - Modified Do-compile to run the test suite with ps-protocol and against
the embedded server by default (if included). These additional steps can
  be skipped by providing "--skip-embedded-test" and "--skip-ps-test"


Build-tools/Do-compile:
  - enabled running the test suite with ps-protocol and against the embedded
    server by default (if included). These additional steps can be skipped
    by providing "--skip-embedded-test" and "--skip-ps-test"
2005-01-12 13:06:06 +01:00
unknown
7310387078 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2005-01-12 12:35:34 +01:00
unknown
452eda8d3e merged. ul. 2005-01-12 12:24:23 +01:00
unknown
0bcfc49b4b added missing Com_update_multi status variable 2005-01-12 12:18:17 +01:00
unknown
ed6c9afd6d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-01-12 11:20:05 +01:00
unknown
7e36a0b7cb ndb - fix 64-bit problem in autotest
ndb/test/src/CpcClient.cpp:
  Fix 64-bit problem
2005-01-12 11:17:03 +01:00
unknown
d853e732b9 Fix for bug #7586 "TIMEDIFF for sec+microsec not working properly".
mysql-test/r/func_sapdb.result:
  Added test for bug #7586 "TIMEDIFF for sec+microsec not working
  properly". Corrected previously wrong results of couple other
  statements.
mysql-test/t/func_sapdb.test:
  Added test for bug #7586 "TIMEDIFF for sec+microsec not working
  properly".
sql/item_timefunc.cc:
  Item_func_timediff::val_str():
   Use simplier and less error-prone implementation. Now we are counting 
   difference between time values in microseconds and convert it to time
   value (instead of using seconds and taking difference in "second_part"s 
   into account).
2005-01-12 12:18:36 +03:00
unknown
d5a3f4a6e3 ndbcluster.sh:
increased timeouts to see if more tests get started automatically


mysql-test/ndb/ndbcluster.sh:
  increased timeouts to see if more tests get started automatically
2005-01-11 23:09:10 +01:00
unknown
90d6c0629f Merge jwinstead@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 21:55:39 +01:00
unknown
6eb792304c Merge mysql.com:/home/jwinstead2/mysql-4.1-6418
into mysql.com:/home/jwinstead2/mysql-4.1-clean
2005-01-11 21:53:39 +01:00
unknown
f214faa8ad Replace ZLIB_LIBS in mysql_config. (Bug #6418)
scripts/Makefile.am:
  Replace ZLIB_LIBS
2005-01-11 21:50:30 +01:00
unknown
43a5a490ca Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-11 21:09:22 +01:00
unknown
22de488557 Fixed Bug#2813, "analyse does not quot string values in enams from string". 2005-01-11 19:40:33 +02:00
unknown
28b783eada Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/sql_class.h:
  Auto merged
2005-01-11 19:35:00 +02:00
unknown
4eec8ab1f6 Review of new pushed code
Indentation cleanup


client/mysqladmin.cc:
  Indentation cleanup
2005-01-11 18:55:53 +02:00
unknown
7bb97a4ad8 Bug #7730 Server crash using soundex on an utf8 table
Don't use my_tolower: it works only for 8bit charsets.
2005-01-11 19:58:53 +04:00
unknown
427bdc28ee Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.5920


client/mysql.cc:
  Auto merged
2005-01-11 19:58:52 +04:00
unknown
4245f22b56 Merge mysql.com:/space/my/mysql-4.1
into mysql.com:/space/my/mysql-4.1-build
2005-01-11 16:02:45 +01:00
unknown
62113c1011 A fix for Bug#7365 "embedded server for MacOS: problem with prepared
statements": no test case, the test case is there already, 
libmysqld/examples/client_test.c, we just need to run it on a daily basis.


libmysqld/lib_sql.cc:
  Convert statement id to least significant byte first format,
  uset for data transmission in MySQL protocol. It's assumed to be 
  in this format by mysql_stmt_execute.
2005-01-11 18:02:44 +03:00