Commit graph

23045 commits

Author SHA1 Message Date
unknown
6f7bccd1ac Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root


include/my_dbug.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-05-18 21:13:45 +04:00
unknown
1816b5a4a4 Fix a couple of compilation failures.
include/my_dbug.h:
  Fix conflicting declaration and definition of db_output.
sql/mysqld.cc:
  Fix a compilation failure.
2005-05-18 21:11:15 +04:00
unknown
48ce8aebd5 New file default_modify.c. Fixed a typo on mysqld.cc
Changed name of function my_correct_default_file to
modify_defaults_file. Improved function and fixed some
bugs in it.


include/my_sys.h:
  Changed function name.
include/mysql_com.h:
  New function, modify_defaults_file()
libmysql/Makefile.shared:
  New file, default_modify.lo
libmysql/libmysql.def:
  New function, modify_defaults_file() and fixed version number.
libmysqld/libmysqld.def:
  New function, modify_defaults_file()
mysys/Makefile.am:
  New file, default_modify.c
mysys/default.c:
  Removed function from default.c. New, corresponding one is in default_modify.c,
  name is modify_defaults_file.
server-tools/instance-manager/commands.cc:
  Changed function name.
sql/mysqld.cc:
  Fixed typo.
2005-05-18 20:10:17 +03:00
unknown
53af474ba0 Update mysqldump test and results
mysql-test/r/mysqldump.result:
  Update results
mysql-test/t/mysqldump.test:
  Fix test to not include version number in results
2005-05-18 09:40:12 -07:00
unknown
40772cccb3 Fix conflicting declaration and definition of db_output (compilation
failure).


include/my_dbug.h:
  Fix conflicting declaration and definition of db_output.
2005-05-18 20:30:22 +04:00
unknown
0f02da9f4e Resolve bugfix merge
client/mysqldump.c:
  Merge bug fix
mysql-test/r/mysqldump.result:
  Update results
mysql-test/t/mysqldump.test:
  Merge bug fix
2005-05-18 09:25:06 -07:00
unknown
eff871bd6c Small optimization to bug fix, from Monty.
client/mysqldump.c:
  Optimize away a call to strend() by using return value of my_snprintf()
2005-05-18 09:12:37 -07:00
unknown
0295b2eb3c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root
2005-05-18 20:11:23 +04:00
unknown
ada8087666 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2005-05-18 18:05:37 +02:00
unknown
6f59f4a680 Merge mysql.com:/opt/local/work/mysql-5.0-root
into mysql.com:/media/sda1/mysql/mysql-5.0-libtool
2005-05-18 20:01:47 +04:00
unknown
8b1d4fd3a0 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-05-18 19:01:16 +03:00
unknown
d93806ef7d Fix warnings from icc
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling


config/ac-macros/misc.m4:
  Remove warnings flags from icc when compiling with -Werror
configure.in:
  Remove warnings flags from icc when compiling with -Werror
extra/replace.c:
  Fix warnings from icc
include/my_dbug.h:
  Fix warnings from icc
sql/gen_lex_hash.cc:
  Fix warnings from icc
sql/mysql_priv.h:
  Add missing variables
sql/mysqld.cc:
  Fix warnings from icc:
  - made a lot of variables static
  - Removing some not used variables
  - Fixed wrong printf()
  - removed extern "C" from some functions
sql/spatial.h:
  Fix warnings from icc
sql/sql_acl.cc:
  Fixed memory leak
sql/sql_lex.cc:
  Fix warnings from icc
sql/sql_lex.h:
  Fix warnings from icc
2005-05-18 19:00:21 +03:00
unknown
fed9e19112 ndb - allow upgrade 4.1.10->4.1.12
ndb/src/common/util/version.c:
  allow upgrade 4.1.10->4.1.12
2005-05-18 17:47:43 +02:00
unknown
1c0e670911 A draft comment for mysql_select. Feel free to moderate and improve. 2005-05-18 19:35:20 +04:00
unknown
6e1e571b35 make_win_src_distribution.sh:
Add YASSL to Windows source distribution
  Skip .deps, and remove .o files from source dist


scripts/make_win_src_distribution.sh:
  Add YASSL to Windows source distribution
  Skip .deps, and remove .o files from source dist
2005-05-18 16:04:44 +02:00
unknown
57ba8d3ed1 Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-4.1
into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-4.1
2005-05-18 16:58:37 +03:00
unknown
8c4e286064 reduced 1 server reloding during test
BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2:
  Delete: mysql-test/t/grant_cache-master.opt
mysql-test/r/grant_cache.result:
  query cache management moved inside test
mysql-test/t/grant_cache.test:
  query cache management moved inside test to privent server reloading during test
2005-05-18 16:41:32 +03:00
unknown
880bff9263 Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0
into lmy003.wdf.sap.corp:/home/schwenke/Work/MySQL/bk-internal-tree/mysql-5.0
2005-05-18 15:34:49 +02:00
unknown
a847042f53 new build scripts for SAP team
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-18 15:28:51 +02:00
unknown
89eeff659f Merge mysql.com:/usr/home/ram/work/mysql-5.0-build
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-05-18 18:15:14 +05:00
unknown
41407d1a64 Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-05-18 14:31:15 +02:00
unknown
9c9e64d543 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-05-18 16:31:14 +04:00
unknown
0a2b07254f olap.result, olap.test:
Added test cases for bug #7914.
sql_select.cc:
  Fixed bug #7914: rollup over expresssions such as sum(a)+1.


sql/sql_select.cc:
  Fixed bug #7914: rollup over expresssions such as sum(a)+1.
mysql-test/t/olap.test:
  Added test cases for bug #7914.
mysql-test/r/olap.result:
  Added test cases for bug #7914.
2005-05-18 05:15:48 -07:00
unknown
c3ecc1ddf9 fixed fatal compiler error (windows) 2005-05-18 14:13:58 +02:00
unknown
688afe8175 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-05-18 16:07:12 +04:00
unknown
832a2b27fb fix for compilation problem with --with-openssl reported by Guilhem
server-tools/instance-manager/Makefile.am:
  fix for compilation problem with --with-openssl
2005-05-18 16:05:58 +04:00
unknown
829d3f7376 Merge grichter@bk-internal1.mysql.com:/home/bk/mysql-5.0
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0


libmysql/libmysql.def:
  Auto merged
2005-05-18 13:57:33 +02:00
unknown
a9ce42c3ae Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0
2005-05-18 13:37:59 +02:00
unknown
625bf498eb Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/cps/mysql/trees/mysql-5.0
2005-05-18 15:29:37 +04:00
unknown
6ca52fcc95 fix comments
server-tools/instance-manager/commands.cc:
  fix column name
2005-05-18 15:28:38 +04:00
unknown
9b2e0ed5d2 Remove automatically generated autotools files from revision control.
Fix build scripts to create them.


BitKeeper/deleted/.del-config.guess~fd94a91a69a8ce8:
  Delete: config.guess
BitKeeper/deleted/.del-config.sub~d18f703b655db258:
  Delete: config.sub
BitKeeper/deleted/.del-depcomp~d5c35239e36674f1:
  Delete: depcomp
BitKeeper/deleted/.del-install-sh~ddc86c88a9bebd00:
  Delete: install-sh
BitKeeper/deleted/.del-ltconfig~6d12dc759ce40830:
  Delete: ltconfig
BitKeeper/deleted/.del-ltmain.sh~9b8b907df176f96e:
  Delete: ltmain.sh
BitKeeper/deleted/.del-missing~3fe9ea908d3a7caa:
  Delete: missing
BitKeeper/deleted/.del-mkinstalldirs~fa914ace602e1447:
  Delete: mkinstalldirs
BUILD/FINISH.sh:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-ccc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-cxx:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-debug:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-hpux11-parisc2-aCC:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-ia64-debug-max:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-irix-mips64-mipspro:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-pentium-pgcc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-debug:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-forte:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-purify:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BitKeeper/etc/ignore:
  Added config.guess config.sub install-sh ltmain.sh missing to the ignore list
2005-05-18 15:23:29 +04:00
unknown
fce1521033 sql_yacc.yy:
Added missing ';'.


sql/sql_yacc.yy:
  Added missing ';'.
2005-05-18 04:17:13 -07:00
unknown
b842158263 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10339
2005-05-18 16:06:01 +05:00
unknown
32ce862f20 mysqldump.c: disabling --delayed-insert until BUG#7815 is fixed (need table def cache for that,
to easily check the storage engine supports DELAYED).



client/mysqldump.c:
  disabling --delayed-insert until BUG#7815 is fixed (need table def cae)
mysql-test/r/mysqldump.result:
  as we disable --delayed-insert, result changes
2005-05-18 13:02:09 +02:00
unknown
a2502ed415 make_binary_distribution.sh:
To be safe, put "..." around variables to the test command


scripts/make_binary_distribution.sh:
  To be safe, put "..." around variables to the test command
2005-05-18 12:49:43 +02:00
unknown
d8c83c5f98 commands.cc, parse.h, parse.cc, instance_options.cc:
Prefix enum symbols LOG_* with IM_, not to clash with system headers


server-tools/instance-manager/instance_options.cc:
  Prefix enum symbols LOG_* with IM_, not to clash with system headers
server-tools/instance-manager/parse.cc:
  Prefix enum symbols LOG_* with IM_, not to clash with system headers
server-tools/instance-manager/parse.h:
  Prefix enum symbols LOG_* with IM_, not to clash with system headers
server-tools/instance-manager/commands.cc:
  Prefix enum symbols LOG_* with IM_, not to clash with system headers
2005-05-18 12:34:38 +02:00
unknown
b1f6de6de6 Merge mysqldev@production.mysql.com:my/mysql-5.0-build
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-build
2005-05-18 12:18:29 +02:00
unknown
17f37d95be default.c:
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
  Removed unused variable 'field' from print_warnings()
libmysql.dsp:
  Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
  Added "my_chsize.c"


VC++Files/client/mysqlclient.dsp:
  Added "my_chsize.c"
VC++Files/libmysql/libmysql.dsp:
  Added "my_chsize.c" and "my_seek.c"
client/mysql.cc:
  Removed unused variable 'field' from print_warnings()
mysys/default.c:
  Disabled use of GetSystemWindowsDirectory() when compiled with VC6
2005-05-18 12:15:28 +02:00
unknown
93e8f1824a A fix (bug #10703: rpl_variables.test failure).
mysql-test/r/rpl_variables.result:
  A fix (bug #10703: rpl_variables.test failure).
  "$SLAVE_LOAD_TMPDIR" may differ from the "$MYSQL_TEST_DIR/var/tmp".
mysql-test/t/rpl_variables.test:
  A fix (bug #10703: rpl_variables.test failure).
  "$SLAVE_LOAD_TMPDIR" may differ from the "$MYSQL_TEST_DIR/var/tmp".
2005-05-18 15:10:43 +05:00
unknown
efc254bc92 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10339


sql/set_var.h:
  Auto merged
2005-05-18 14:50:57 +05:00
unknown
3814661dc4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286
2005-05-18 14:48:04 +05:00
unknown
9971175072 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b10339


mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/set_var.cc:
  Auto merged
2005-05-18 14:46:05 +05:00
unknown
f79897a57f Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/home/pem/work/mysql-5.0


sql/item.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
2005-05-18 11:09:30 +02:00
unknown
90a2edd784 Fixed BUG#6048: Stored procedure causes operating system reboot.
Memory leak in locally evalutated expressions during SP execution fixed by
  reusing allocated item slots when possible.
  Note: No test case added, since the test is a stress test that tries to make
  the machine to run out of memory.


sql/item.cc:
  Make it possible to reuse allocated item slots (for use in SP execution).
sql/item.h:
  Make it possible to reuse allocated item slots (for use in SP execution).
sql/sp_head.cc:
  Reuse allocated item slots for expression evalutation during SP execution.
sql/sp_rcontext.cc:
  Updated sp_eval_func_item() call, and prevent item reuse in reused frames (for handlers).
2005-05-18 11:07:57 +02:00
unknown
afc94dfbb6 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


mysql-test/t/range.test:
  Auto merged
2005-05-18 11:03:05 +02:00
unknown
0a21bf0c5a test result change: now "enum... not null" doesn't print default value. 2005-05-18 14:02:03 +05:00
unknown
afe6779385 test fixes
mysql-test/mysql-test-run.sh:
  always use --no-defaults
mysql-test/t/range.test:
  range.test does not requires innodb
2005-05-18 10:57:07 +02:00
unknown
26b619b338 ndberror.c:
updated error message for ndb


ndb/src/ndbapi/ndberror.c:
  updated error message for ndb
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-18 10:22:27 +02:00
unknown
e8f272e206 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/gluh/MySQL/Bugs/5.0.9286


sql/sql_yacc.yy:
  Auto merged
2005-05-18 12:52:02 +05:00
unknown
74b93e57b5 Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables(for 5.0) 2005-05-18 12:47:45 +05:00