Commit graph

23826 commits

Author SHA1 Message Date
unknown
728ef761d4 mysqld.dsp:
Corrected typo


VC++Files/sql/mysqld.dsp:
  Corrected typo
2005-06-10 04:09:42 +02:00
unknown
cec24f7746 Merge mysql.com:/home/jimw/my/mysql-4.1-11122
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:03:55 -07:00
unknown
72724bd84b Merge mysql.com:/home/jimw/my/mysql-4.1-10566
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:03:18 -07:00
unknown
a323d527d4 Merge mysql.com:/home/jimw/my/mysql-4.1-10931
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-09 18:02:04 -07:00
unknown
967256ebd7 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/ps_6bdb.result:
  Auto merged
include/my_global.h:
  SCCS merged
2005-06-09 18:00:47 -07:00
unknown
3e5491e6e9 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-06-09 23:00:04 +02:00
unknown
9fc8020866 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0


sql/sql_acl.cc:
  Auto merged
2005-06-09 13:11:54 -07:00
unknown
eae4072e4b remove old libmysqld.a before assembling a new one 2005-06-09 22:04:05 +02:00
unknown
6809ceb718 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-06-09 21:54:06 +03:00
unknown
5643df2d58 Fixes in function modify_defaults_file():
- Removed unneccessary variables.
- Made a function of that part of code, which actually changes 
  the line under modifications.
- Fixed memory overrun problem with my_malloc. Too little space
  was reserved.
- Fixed problem in case, when new option was added at the end
  of the section. Before, it was added as the last line of the
  section, even if it left empty lines between.
- Fixed so that the configuration file is not saved unneccessarily,
  if no modifications are done. (file timestamp remains)
- This should fix (at least partially) problems described in
  Bug#10806
2005-06-09 21:50:22 +03:00
unknown
90bdba0767 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/mysql_priv.h:
  Auto merged
2005-06-09 20:02:06 +02:00
unknown
a1650deab6 Adding auxiliary scripts that allow to display messages in result files from within test files
- show_msg.inc   - displays a message followed by a line of '-' at the length of the messgae
 - show_msg80.inc - displays a message followed by a line of '-' with a fixed length of 80


mysql-test/r/mysqltest.result:
  Updated result file
mysql-test/t/mysqltest.test:
  Added test cases to test the show_msg.inc and show_msg80.inc auxiliary files
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-06-09 11:01:23 -07:00
unknown
3841a370a1 Fix use of _cgets() to handle an input line that exceeds our buffer space
before a newline is found. (Bug #10840)


client/mysql.cc:
  Call _cgets() as many times as necessary to get the full line of input
2005-06-09 19:44:59 +02:00
unknown
b4326ccf6d Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into xiphis.org:/usr/home/antony/work2/p1-bug11028.4
2005-06-09 18:44:59 +01:00
unknown
16b6ced0c7 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
2005-06-09 09:36:44 -07:00
unknown
f8f95d1c91 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/var/tmp/sslbug/mysql-4.1
2005-06-09 21:22:44 +05:00
unknown
4a8024c53d Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0
2005-06-09 09:20:00 -07:00
unknown
9227cf4254 Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2005-06-09 09:19:57 -07:00
unknown
8ab8fca7d5 select.test, select.result:
Added a test case for bug #10084.
sql_yacc.yy:
  Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
  added.


sql/sql_yacc.yy:
  Fixed bug #10084: STRAIGHT_JOIN for expressions with ON was
  added.
mysql-test/r/select.result:
  Added a test case for bug #10084.
mysql-test/t/select.test:
  Added a test case for bug #10084.
2005-06-09 09:16:16 -07:00
unknown
fec1c6ac67 Merge
BitKeeper/etc/logging_ok:
  auto-union
myisam/mi_check.c:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/set_var.cc:
  Auto merged
mysql-test/r/sql_mode.result:
  SCCS merged
mysql-test/t/sql_mode.test:
  SCCS merged
sql/sql_acl.cc:
  SCCS merged
sql/sql_handler.cc:
  SCCS merged
sql/sql_table.cc:
  SCCS merged
2005-06-09 17:15:06 +01:00
unknown
2ea6a08e57 2005-06-09 18:02:07 +02:00
unknown
db15e5c391 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into xiphis.org:/usr/home/antony/work2/p1-bug11028.3
2005-06-09 16:44:03 +01:00
unknown
c995109b69 Bug#11028 Crash on create table like
Report error instead of crashing


mysql-test/r/create.result:
  Test for bug 11028
mysql-test/t/create.test:
  Test for bug 11028
sql/sql_table.cc:
  fix for null db name
2005-06-09 16:06:15 +01:00
unknown
5d9cd6a35e Many files:
More yaSSL changes in Visual Studio 6 project files


VC++Files/client/mysql.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqladmin.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/mysql.dsw:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqldump.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqlimport.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqlshow.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqltest.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/libmysql/libmysql.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/libmysqld/libmysqld.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/mysqlcheck/mysqlcheck.dsp:
  More yaSSL changes in Visual Studio 6 project files
VC++Files/tests/mysql_client_test.dsp:
  More yaSSL changes in Visual Studio 6 project files
2005-06-09 16:53:08 +02:00
unknown
d0db70270c A fix and test case for Bug#10729 "mysql_stmt_attr_set
CURSOR_TYPE_READ_ONLY". The bug was that we (me) don't perform proper
cleanups of the prepared statement when done fetching from a cursor.
Another patch.


sql/mysql_priv.h:
  Rename reset_stmt_for_execute to init_stmt_before_use (to correspond to
  cleanup_stmt_and_thd_after_use).
sql/sp_head.cc:
  Rename.
sql/sql_prepare.cc:
  Move common cleanup code to a cleanup function, call it when we close
  a cursor.
sql/sql_select.cc:
  Cleanup.
sql/sql_select.h:
  No need for init_thd, this code has been inlined in Cursor::open.
tests/mysql_client_test.c:
  Add a test case for Bug#10729 "mysql_stmt_attr_set CURSOR_TYPE_READ_ONLY"
  (problem reusing a prepared statemnt if there was a cursor)
2005-06-09 18:17:45 +04:00
unknown
dcfe258fd2 Bug #8183 MERGE and SYM cause wrong SHOW CREATE TABLE
Without this patch, all file elements in info have symlink resolved
pathnames.  This means append_create_info does not  have any way
of showing the correct database name when a symlinked database is used.


myisam/mi_open.c:
  store name (not symlinked resolved) instead of org_name (symlink resolved)
  in info.
2005-06-09 09:00:51 -05:00
unknown
d974ce936e Fix broken test suite. 2005-06-09 18:00:50 +04:00
unknown
9f326d6a66 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/mysql_priv.h:
  Auto merged
2005-06-09 15:53:35 +02:00
unknown
1438e06e3a sql/mysql_priv.h
comments,
    unused flag OPTION_INTERNAL_SUBTRANSACTIONS removed
    SELECT_ALL flag moved into this free slot.


bdb/dist/configure.ac:
  don't link bdb with -pthread on FreeBSD
extra/yassl/taocrypt/include/modes.hpp:
  fix alignment in yassl - proper fix is required
sql/ha_berkeley.cc:
  remove unused flag OPTION_INTERNAL_SUBTRANSACTIONS
sql/mysql_priv.h:
  comments,
  unused flag OPTION_INTERNAL_SUBTRANSACTIONS removed
  SELECT_ALL flag moved into this free slot.
2005-06-09 15:48:57 +02:00
unknown
3889c1e05b mysql_test_run_new.c:
Corrected path to SSL certificate files


mysql-test/mysql_test_run_new.c:
  Corrected path to SSL certificate files
2005-06-09 15:46:33 +02:00
unknown
62b1f1e34f mysql-test-run.pl, mysql-test-run.sh:
Corrected path to SSL certificate files


mysql-test/mysql-test-run.sh:
  Corrected path to SSL certificate files
mysql-test/mysql-test-run.pl:
  Corrected path to SSL certificate files
2005-06-09 15:19:10 +02:00
unknown
baae624cdb Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-09 17:15:50 +05:00
unknown
146893a7a0 Fix for bug #10083 (round doesn't increase scale)
mysql-test/r/func_math.result:
  test result fixed
mysql-test/t/func_math.test:
  test case added
sql/item_func.cc:
  now we always use decimals_to_set
2005-06-09 15:27:26 +05:00
unknown
42b4b3ce58 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Merge/4.1
2005-06-09 15:26:46 +05:00
unknown
0e54a4e84f update result file for ps7_ndb
mysql-test/r/ps_7ndb.result:
  fix result file
2005-06-09 12:26:45 +02:00
unknown
f160958770 Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message
generate proper error message if we use SET ... = NULL for 'set'
  variables
2005-06-09 14:39:29 +05:00
unknown
9f4e920f4a Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-06-09 11:37:10 +02:00
unknown
210f576c87 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
2005-06-09 13:45:43 +05:00
unknown
7073dda620 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.8482
2005-06-09 13:31:29 +05:00
unknown
897b3c50e8 a fix (bug #11193: error messages gets garbled after reggies latest changeset: ChangeSet@1.2260.1.). 2005-06-09 13:13:02 +05:00
unknown
98c2ec7538 Fix for bug #8482 (Incorrect rounding)
mysql-test/r/type_newdecimal.result:
  test result fixed
mysql-test/t/type_newdecimal.test:
  test case added
strings/decimal.c:
  in round(999.9, 0) case we have to increase intg
2005-06-09 12:44:44 +05:00
unknown
467b6dc477 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1-push
2005-06-09 08:12:14 +02:00
unknown
af0287be3c ndb - autotest
small script fixes
  - Don't use hostname -s as it's linux specific
  - Don't remove result unless scp worked


ndb/test/run-test/ndb-autotest.sh:
  Don't use hostname -s as it's linux specific
  Don't remove result unless scp worked
2005-06-09 08:07:48 +02:00
unknown
fa02ee1a52 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-09 07:57:10 +02:00
unknown
2e8a10334b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-06-09 07:52:02 +02:00
unknown
b854d06bf0 ndb - uint overflow when running on 64-bit platform with more than 4Gb of mem
bug#10711
bug#10058
bug#9363
bug#9025
bug#8918


ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Use UintPtr when computing page address to make sure that Uint32 does not overflow
2005-06-09 07:49:48 +02:00
unknown
e809d1e189 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into brian-akers-computer.local:/Users/brian/mysql/mysql-5.0


sql/log_event.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2005-06-08 22:29:10 -07:00
unknown
f63f15e7ab config-win.h:
Enabled yaSSL on Windows
Many files:
  Added yaSSL to Visual Studio 6 project files


VC++Files/mysql.dsw:
  Added yaSSL to Visual Studio 6 project files
VC++Files/client/mysqlclient.dsp:
  Added yaSSL to Visual Studio 6 project files
VC++Files/client/mysqltest.dsp:
  Added yaSSL to Visual Studio 6 project files
VC++Files/libmysqld/examples/test_libmysqld.dsp:
  Added yaSSL to Visual Studio 6 project files
VC++Files/sql/mysqld.dsp:
  Added yaSSL to Visual Studio 6 project files
VC++Files/vio/vio.dsp:
  Added yaSSL to Visual Studio 6 project files
include/config-win.h:
  Enabled yaSSL on Windows
2005-06-09 05:04:59 +02:00
unknown
344f13d6f1 Make sure we don't mistake a "grep mysqld" for a mysqld process
when checking if the server is running in mysqld_safe. (Bug #11122)


configure.in:
  Add "grep -v grep" to FIND_PROC so we don't mistake "grep mysqld"
  for a mysqld process.
2005-06-08 18:57:39 -07:00
unknown
92354ea6d6 mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp:
Added /FD flag, to avoid include file warnings
mysqlclient.dsp:
  Removed duplicate entry for "strings/ctype-cp932.c"
  Added missing "mysys/my_access.c"
libmysqld.dsp:
  Added missing "mysys/charset.c"
libmysqld.def:
  Added symbol 'get_charset_name'


libmysqld/libmysqld.def:
  Added symbol 'get_charset_name'
VC++Files/libmysqld/libmysqld.dsp:
  Added missing "mysys/charset.c"
VC++Files/client/mysqlclient.dsp:
  Removed duplicate entry for "strings/ctype-cp932.c"
  Added missing "mysys/my_access.c"
VC++Files/client/mysqltest.dsp:
  Added /FD flag, to avoid include file warnings
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Added /FD flag, to avoid include file warnings
VC++Files/tests/mysql_client_test.dsp:
  Added /FD flag, to avoid include file warnings
2005-06-09 00:49:37 +02:00