Commit graph

40511 commits

Author SHA1 Message Date
unknown
922ea687fb Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/lib/mtr_process.pl:
  Auto merged
2006-12-01 10:17:27 +01:00
unknown
1c8facbc9f Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-30 22:47:50 +01:00
unknown
0bc42ce633 late after-merge fix
mysql-test/mysql-test-run.pl:
  late after-merge fix: re-add MTR_BUILD_THREAD=auto
2006-11-30 22:45:55 +01:00
unknown
f8d8b3db91 Bug #24487 Valgrind: uninited byte in table->record[1] in binlog code for rbr + inno db
The reason of this valgrind's compaint is not a bug but rather a feature of bitwise ops:
for any value of the byte x
x | 1 -> 1,  and x & 0 -> 0.
x, being a null_byte part of record[1] can be left unassigned even after
ha_innobase::index_read_idx because the above and still be correct.
Addding a check memory upon the invocation of the function can detect this fact
long before record[1], old record, is eventually passed to my_write.

Fixed with initialization of record[1]'s null_bytes part in open_table_from_share.


sql/table.cc:
  initialization of null-bytes for valgrind.
2006-11-30 19:56:34 +02:00
unknown
899ee4595b Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/lib/mtr_process.pl:
  Auto merged
2006-11-30 13:32:16 +01:00
unknown
32f0650142 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/lib/mtr_process.pl:
  Auto merged
2006-11-30 13:27:26 +01:00
unknown
5af42c1b25 minor fix to mtr_process.pl
mysql-test/lib/mtr_process.pl:
  print extra message _once_ every 60 seconds
2006-11-30 13:16:12 +01:00
unknown
2467dc1423 Merge trift2.:/MySQL/M51/push-5.1
into  trift2.:/MySQL/M51/bug24182-5.1
2006-11-30 11:05:12 +01:00
unknown
ba4c767e73 support-files/mysql.spec.sh : Call "make install" using "benchdir_root=%{_datadir}" (bug#24182).
support-files/mysql.spec.sh:
  Call "make install" using "benchdir_root=%{_datadir}", because that is affecting 
  the regression test suite as well.    Fixes bug#24182.
2006-11-30 11:03:49 +01:00
unknown
3099fd27b0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2006-11-30 10:38:54 +01:00
unknown
46fd7deccb Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
2006-11-30 01:45:16 +01:00
unknown
6949b04246 A post-merge fix: fix the failing trigger-grant.test.
sql/sql_trigger.cc:
  Another post-merge fix: make TRIGGER privilege work again, after
  IF EXISTS refactoring.
2006-11-30 03:34:10 +03:00
unknown
21fdaf5e83 A post-merge fix.
mysql-test/r/func_str.result:
  Update results (a post-merge fix).
2006-11-30 02:51:41 +03:00
unknown
0717e6c3c6 A post-merge fix. 2006-11-30 02:42:01 +03:00
unknown
126375b16a Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/lib/mtr_io.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/rpl_trigger.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/im_utils.imtest:
  Auto merged
mysql-test/t/rpl_trigger.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Use local.
mysql-test/r/func_str.result:
  SCCS merged
mysql-test/t/func_str.test:
  Manual merge.
sql/sql_trigger.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge.
2006-11-30 02:36:18 +03:00
unknown
4ec847218d Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-30 02:05:40 +03:00
unknown
c670cad062 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-30 02:04:43 +03:00
unknown
bfde6f3edf Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
2006-11-30 02:00:39 +03:00
unknown
73079a2406 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
2006-11-30 01:58:57 +03:00
unknown
66b53b1642 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


sql/sql_yacc.yy:
  Auto merged
2006-11-30 01:40:49 +03:00
unknown
afc91556fb Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2006-11-29 23:36:26 +03:00
unknown
84d4f160ae Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged
2006-11-29 20:25:20 +01:00
unknown
f380caa8eb Merge mysql.com:/home/kent/bk/mysql-4.1-build
into  mysql.com:/home/kent/bk/mysql-5.0-build


Makefile.am:
  SCCS merged
2006-11-29 20:24:41 +01:00
unknown
3b1abddb25 Makefile.am:
Remove soft links before creating source TAR, to avoid file copies (bug#11865)


Makefile.am:
  Remove soft links before creating source TAR, to avoid file copies (bug#11865)
2006-11-29 20:22:58 +01:00
unknown
5d5c8c0312 Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged
2006-11-29 19:42:19 +01:00
unknown
1a32976dea Makefile.am:
Corrected change to create "win" directory


Makefile.am:
  Corrected change to create "win" directory
2006-11-29 19:41:48 +01:00
unknown
3080e5a3d7 Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged
2006-11-29 19:37:59 +01:00
unknown
c2a9b34b92 Makefile.am:
"make distcheck" fix, "win" directory


Makefile.am:
  "make distcheck" fix, "win" directory
2006-11-29 19:35:40 +01:00
unknown
ea97ee36b0 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1


sql-common/my_time.c:
  Auto merged
2006-11-29 18:47:40 +01:00
unknown
8f71610f9c Many files:
Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries


config/ac-macros/ssl.m4:
  Use libtool way of specifying yaSSL libraries
libmysqld/Makefile.am:
  Adjusted path to yaSSL libtool libraries
storage/ndb/config/type_kernel.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapi.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitest.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_ndbapitools.mk.am:
  Changed paths to ndb include directory to include "storage"
storage/ndb/config/type_util.mk.am:
  Changed paths to ndb include directory to include "storage"
2006-11-29 18:36:51 +01:00
unknown
2477bd5a03 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


configure.in:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
2006-11-29 18:31:13 +01:00
unknown
bc3fe09a77 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637


sql/sql_yacc.yy:
  Auto merged
2006-11-29 18:54:01 +03:00
unknown
b95672272c Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20637
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20637


sql/sql_yacc.yy:
  Auto merged
2006-11-29 18:51:28 +03:00
unknown
d6eb362755 Merge mysql.com:/home/kent/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
extra/yassl/taocrypt/benchmark/benchmark.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.dsp:
  Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
  Auto merged
extra/yassl/taocrypt/test.dsp:
  Auto merged
extra/yassl/testsuite/testsuite.dsp:
  Auto merged
extra/yassl/yassl.dsp:
  Auto merged
extra/yassl/yassl.vcproj:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
strings/decimal.c:
  Auto merged
2006-11-29 14:35:59 +01:00
unknown
e93a20a5fc Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/mysql-5.1-build


sql-common/my_time.c:
  Auto merged
2006-11-29 14:28:05 +01:00
unknown
412d284e06 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-29 14:26:47 +01:00
unknown
ea7559ceab Merge mysql.com:/home/kent/bk/mysql-4.1-build
into  mysql.com:/home/kent/bk/mysql-5.0-build
2006-11-29 14:25:30 +01:00
unknown
ef188cb019 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  trift2.:/MySQL/M51/push-5.1
2006-11-29 14:03:34 +01:00
unknown
c707c7eae7 BUG#20637: "load data concurrent infile" locks the table
Note that we ignore CONCURRENT if LOAD DATA CONCURRENT is used from
inside a stored routine and MySQL is compiled with Query Cache support
(this is not in the manual).

The problem was that the condition test of "we are inside stored routine"
was reversed, thus CONCURRENT _worked only_ from stored routine.  The
solution is to use proper condition test.

No test case is provided because the test case would require a large
amount of input, and it's hard to tell is SELECT is really blocked or
just slow (subject to race).


sql/sql_yacc.yy:
  Fix the condition of TL_WRITE_CONCURRENT_INSERT on LOAD DATA CONCURRENT,
  which was reversed, and return valid value if we are in SP.
2006-11-29 15:51:53 +03:00
unknown
abbece412b Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1


sql-common/my_time.c:
  Auto merged
2006-11-29 10:36:53 +01:00
unknown
d765ed0c37 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
2006-11-29 10:35:15 +01:00
unknown
e0bf8da96e Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-29 10:33:23 +01:00
unknown
b58adf2fbb Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-29 10:23:48 +01:00
unknown
abb3dfc43d Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
2006-11-29 10:22:43 +01:00
unknown
3344298d19 minor fix
mysql-test/mysql-test-run.pl:
  remove dependency on Data::Dumper, it's not used anywhere
2006-11-29 10:21:59 +01:00
unknown
b51cf26629 Merge bk-internal:/home/bk/mysql-5.1
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


sql/sql_parse.cc:
  Auto merged
2006-11-29 10:21:13 +01:00
unknown
0e978328ae Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


libmysql/libmysql.c:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
server-tools/instance-manager/mysql_connection.cc:
  Rollback Monty's removals of explicit casts
tests/mysql_client_test.c:
  SCCS merged
2006-11-29 11:44:37 +03:00
unknown
b4b2d3bcb4 Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
tests/mysql_client_test.c:
  Manual merge: use local.
2006-11-29 11:19:55 +03:00
unknown
84d5733bbe Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
2006-11-29 09:18:06 +01:00
unknown
0ec590fab8 Varchar hack to clean strings removed.
storage/archive/ha_archive.cc:
  Removed Varchar cleanup hack. I'm going to commit new pack code.
2006-11-28 18:30:41 -08:00