Commit graph

38940 commits

Author SHA1 Message Date
unknown
e6fbb896ab make_win_bin_dist:
Aligned script with updated 5.0 version


scripts/make_win_bin_dist:
  Aligned script with updated 5.0 version
2006-10-20 20:18:44 +02:00
unknown
7debdee89e Fix small glitch during parsing of ALTER EVENT xyz
with only COMMENT clause. Strangely it has manifestated itself
only on two platforms. This is a fix for bug#23423 
"Syntax error for "ALTER EVENT ... COMMENT ..." on just two platforms"


sql/sql_yacc.yy:
  if COMMENT is used mark it as used.
  There was a missing setting to 1 of $$. If COMMENT
  was used in combinations with other clauses then it
  was passing.
2006-10-19 15:56:37 +02:00
unknown
4681c06642 libmysqld/Makefile.am fixed
config/ac-macros/plugins.m4:
  code moved to the proper place
libmysqld/Makefile.am:
  "" removed
2006-10-19 16:39:24 +05:00
unknown
c475d9e3d3 Makefile.am:
Quote variable in "for"-loop head, in case it can be empty.


libmysqld/Makefile.am:
  Quote variable in "for"-loop head, in case it can be empty.
2006-10-19 04:38:16 +02:00
unknown
3720111cec Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/home/hf/work/mysql-5.1-release
2006-10-18 18:53:08 +05:00
unknown
4c6bba1a29 letter's case fixed
config/ac-macros/plugins.m4:
  x->X
2006-10-18 18:48:38 +05:00
unknown
fe68583216 bug (Embedded library can't be linked)
Problem is that some files moved to storage/*/ still are dependent
on sql/ code (usually use members of THD structure)
that can get different being compiled with another #define-s
Code added to recompile these for the embedded server


config/ac-macros/plugins.m4:
  macros added to check if the storage has sql/ - dependent code
libmysqld/Makefile.am:
  symlink files from storage/*/ needed to be recompiled
  with EMBEDDED_LIBRARY
storage/federated/plug.in:
  ha_federated.cc uses THD structure
storage/heap/plug.in:
  ha_heap.cc uses THD structure
storage/innobase/plug.in:
  ha_innodb.cc uses THD structure
storage/myisam/plug.in:
  ha_myisam.cc uses THD structure
storage/myisammrg/plug.in:
  ha_myisammrg.cc uses THD structure
2006-10-18 17:03:37 +05:00
unknown
d30e4ebb32 mysql.spec.sh:
Aligned test flags to TAR builds


support-files/mysql.spec.sh:
  Aligned test flags to TAR builds
2006-10-18 12:35:45 +02:00
unknown
de3b0d2d4a ndb -
Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)
2006-10-18 10:07:02 +02:00
unknown
86921c180f ndb - remove duplicate solution to ndb_restore_compat make_binary_distribution problem 2006-10-17 15:05:31 +02:00
unknown
9b56f0aabe ndb - ndb_restore_compat
Update make_binary_distribution.sh
  Make sure all files needed for testing are included


scripts/make_binary_distribution.sh:
  Make sure all files needed for testing are included
2006-10-17 13:34:00 +02:00
unknown
919dbf0e4a ndb - fix some ndb strict-alias problems
found with gcc 4.0.2 on Itanium2
  (ndb_dd_* failures)


storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Fix some potentil alias problems
storage/ndb/src/kernel/vm/Pool.hpp:
  Fix potential alias problem
2006-10-16 23:37:00 +02:00
unknown
7ef680fe80 make_binary_distribution.sh:
Split copy of result files to avoid shell limit.
  Added copy of mysql-test/std_data/ndb_backup5{0,1}.
configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.


configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.
scripts/make_binary_distribution.sh:
  Split copy of result files to avoid shell limit.
  Added copy of mysql-test/std_data/ndb_backup5{0,1}.
2006-10-16 02:07:50 +02:00
unknown
cc826bffe2 Makefile.am:
Configure flags makes "lex_hash.h" differ, don't distribute
  pregenerated file, build it after configure (bug#18888).


sql/Makefile.am:
  Configure flags makes "lex_hash.h" differ, don't distribute
  pregenerated file, build it after configure (bug#18888).
2006-10-14 20:03:49 +02:00
unknown
f32a4fa8b0 CMakeLists.txt:
Added mysql_upgrade target to Windows CMake build


client/CMakeLists.txt:
  Added mysql_upgrade target to Windows CMake build
2006-10-13 21:48:27 +02:00
unknown
f64849855b ndb - fix memleak (due to incorrect merge of bug#21941)
recommit into release-clone


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  fix missing "if" statement
2006-10-13 10:11:18 +02:00
unknown
0e4fe05516 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-10-13 03:37:46 +02:00
unknown
eaaf795ce8 log_event.cc, sql_class.cc:
VisualStudio needs cast from (byte*) to (const char*), 3rd arg to _db_dump_()


sql/sql_class.cc:
  VisualStudio needs cast from (byte*) to (const char*), 3rd arg to _db_dump_()
sql/log_event.cc:
  VisualStudio needs cast from (byte*) to (const char*), 3rd arg to _db_dump_()
2006-10-13 03:32:38 +02:00
unknown
cf3b25019c unittest/mytap/tap.c :
Do not (try to) set a signal handler action unless a signal is defined on the platform.


unittest/mytap/tap.c:
  Do not (try to) set a signal handler action unless a signal is defined on the platform.
  SIGXCPU, SIGXFSZ, SIGSYS, and SIGTRAP were reported as undefined in Netware build of 5.1.12-beta.
2006-10-12 22:42:43 +02:00
unknown
c447803076 thr_alarm.c, thr_lock.c, my_global.h:
Avoid multiple define of DBUG_OFF (bug#21749)


mysys/thr_alarm.c:
  Avoid multiple define of DBUG_OFF (bug#21749)
mysys/thr_lock.c:
  Avoid multiple define of DBUG_OFF (bug#21749)
include/my_global.h:
  Avoid multiple define of DBUG_OFF (bug#21749)
2006-10-12 19:43:47 +02:00
unknown
0e2888eba2 Merge mysqldev@production.mysql.com:my/mysql-5.1-release
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
2006-10-12 18:31:39 +02:00
unknown
6a99001c27 mysql.spec.sh:
Corrected path to mysql-test directory
  Removed man1/mysql_explain_log.1


support-files/mysql.spec.sh:
  Corrected path to mysql-test directory
  Removed man1/mysql_explain_log.1
2006-10-12 18:26:17 +02:00
unknown
d41b34bf95 Various tool fixes, necessary to build 5.1.12-beta on Netware.
netware/BUILD/compile-AUTOTOOLS:
  Fixes for Netware builds:
  1) The "autotools" used there have problems with changing variables in Makefiles
     after the initial setting.
  2) "storage/innobase" does not need an autotool run any more.
  3) "automake --verbose" may be able to help if new problems arise.
netware/BUILD/compile-netware-START:
  The CSV engine is now mandatory in 5.1, must not be de-configured.
netware/BUILD/mwenv:
  When testing for a possibly empty shell variable, it is mandatory to use quotes!
netware/BUILD/nwbootstrap:
  The "mwenv" file has been changed, reflect these changes here:
  1) It is no longer necessary to set the variables WINE_BUILD_DIR, BUILD_DIR, and VERSION.
  2) The handling of MYDEV there has changed, the "export" line may be indented.
2006-10-12 18:25:27 +02:00
unknown
1f0c83c187 Override "read-only" permissions when doing "make distcheck".
Docs/Makefile.am:
  Override "read-only" permissions on "manual.chm".
2006-10-11 15:32:32 +02:00
unknown
6b3953286d BUG#21524 ps.test updated to meet recent changes in SQL parser
mysql-test/r/ps.result:
  brand new ps.result recorded out of updated ps.test output
mysql-test/t/disabled.def:
  ps.test enabled anew
mysql-test/t/ps.test:
  ps.test updated to ensure FLUSH/RESET are not allowed in stored functions at both
  parse and execution time
2006-10-11 15:53:56 +04:00
unknown
4d46af6553 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-10-11 10:21:49 +02:00
unknown
12e09c02f5 Merge bk-internal:/home/bk/mysql-5.1-rpl
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
2006-10-11 10:16:46 +02:00
unknown
4fc506529c Merge bk-internal:/home/bk/mysql-5.0-rpl
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-10-11 10:13:56 +02:00
unknown
4bd33a0d72 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


BitKeeper/etc/collapsed:
  auto-union
BitKeeper/etc/ignore:
  auto-union
Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_range.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
2006-10-11 10:01:43 +02:00
unknown
c34940a078 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


include/my_sys.h:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
2006-10-10 21:59:23 +02:00
unknown
687f44fe8e Merge mysql.com:/home/bkroot/mysql-5.0-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-10-10 21:58:46 +02:00
unknown
ef0ee7642a Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
2006-10-10 15:27:47 +02:00
unknown
ff604cb77c ndb -
ndb_restore Return OK even if temporary errors
    (otherwise mysql-test-run/ndb_restore can fail on really slow machines)


storage/ndb/tools/restore/restore_main.cpp:
  Return OK even if temporary errors
2006-10-10 15:26:39 +02:00
unknown
3f3ffdccc1 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/b21474-mysql-5.1-new-rpl


sql/log_event.cc:
  Auto merged
2006-10-10 15:26:02 +02:00
unknown
55ce447188 BUG#21474 (There is a rotation before the last table map):
Removing code to step the group log position and just stepping
the event log position.  If the group log position were stepped
one time too many, it might be that the group starts at a position
that is not possible, e.g., at a Rows_log_event, or between an
Intvar_log_event and the following associated Query_log_event.


sql/log_event.cc:
  Removing code to step the group log position and just stepping
  the event log position.  If the group log position were stepped
  one time too many, it might be that the group starts at a position
  that is not possible, e.g., at a Rows_log_event, or between an
  Intvar_log_event and the following associated Query_log_event.
sql/slave.cc:
  Removing code to step the group log position and just stepping
  the event log position when executing a Format_description_log_event.
  If the group log position were stepped one time too many, it might be that the group starts at a position
  that is not possible, e.g., at a Rows_log_event, or between an
  Intvar_log_event and the following associated Query_log_event.
2006-10-10 15:18:21 +02:00
unknown
010edb7eec Fixes to make replication team tree build on Windows.
sql/log_event.cc:
  Adding casts to make it compile on Windows.
2006-10-10 14:58:40 +02:00
unknown
ffa6c020ee Merge trift2.:/MySQL/M50/clone-5.0
into  trift2.:/MySQL/M50/push-5.0


sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2006-10-10 13:25:55 +02:00
unknown
95d29d0d92 Fix to make it build on all platforms.
Replacing C++ code with C code in a C file.


mysys/mf_iocache2.c:
  There shall not be C++ code in C files.
2006-10-10 12:29:24 +02:00
unknown
e833ecae4b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/csv.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/t/csv.test:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/innobase/btr/btr0btr.c:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/fsp/fsp0fsp.c:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/innobase/include/btr0cur.ic:
  Auto merged
storage/innobase/log/log0log.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/innobase/srv/srv0start.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2006-10-10 11:25:24 +02:00
unknown
6407b7716a Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-10 11:08:23 +02:00
unknown
7037b80970 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work


storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
  Auto merged
2006-10-10 11:06:51 +02:00
unknown
6b4507b9ac ndb - bug#23107
fix bug in test prg
2006-10-10 09:47:30 +02:00
unknown
e486c5171d ndb - bug#23107
fix bug in handling of inactive timeout for scan, when all is delivered


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) set timeout if all scans are at api
  2) Use c_appl_timeout_value when getting scan timeout
ndb/test/ndbapi/testTimeout.cpp:
  test program
2006-10-10 09:37:54 +02:00
unknown
45c30c7fe2 Post-merge fixes.
mysql-test/t/view.test:
  Switching to using symbolic error numbers instead of numbers.
  Using numbers caused test to fail.
2006-10-09 13:47:06 +02:00
unknown
4ae5ba2ded Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
2006-10-08 22:40:25 +05:00
unknown
a7f8da2904 Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines


storage/myisammrg/ha_myisammrg.cc:
  Auto merged
2006-10-08 22:35:27 +05:00
unknown
9397becc6d After merge fix. 2006-10-08 22:34:32 +05:00
unknown
b5ae1184d7 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines


sql/sql_update.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
storage/myisammrg/ha_myisammrg.cc:
  Auto merged
mysql-test/r/windows.result:
  Use remote.
mysql-test/t/windows.test:
  Use remote.
2006-10-08 15:32:00 +05:00
unknown
f43ee99c30 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.0-engines


sql/sql_update.cc:
  Auto merged
2006-10-08 15:14:53 +05:00
unknown
5e81d1301e Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/b19459-mysql-5.1-new


client/mysqlbinlog.cc:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/base64.c:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
sql/share/errmsg.txt:
  SCCS merged
2006-10-06 15:31:05 +02:00