Commit graph

34710 commits

Author SHA1 Message Date
unknown
3ae893c42c Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2007-01-18 10:45:58 +01:00
unknown
94e6883262 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2007-01-18 10:42:06 +01:00
unknown
7c5a417a4e after merge fix. 2007-01-18 10:51:29 +04:00
unknown
2ca87ae30c Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533


mysql-test/r/select.result:
  resolve skipped
mysql-test/t/range.test:
  merging
mysql-test/t/select.test:
  merging
sql/item.cc:
  merging
2007-01-18 09:39:47 +04:00
unknown
af32168623 Fixed bug #25580: incorrect stored representations of views in cases
when they contain the '!' operator.
Added an implementation for the method Item_func_not::print. 
The method encloses any NOT expression into extra parentheses to avoid
incorrect stored representations of views that use the '!' operators.
Without this change when a view was created that contained
the expression !0*5  its stored representation contained not this
expression but rather the expression not(0)*5 . 
The operator '!' is of a higher precedence than '*', while NOT is 
of a lower precedence than '*'. That's why the expression !0*5 
is interpreted as not(0)*5, while the expression not(0)*5 is interpreted
as not((0)*5) unless sql_mode is set to HIGH_NOT_PRECEDENCE.
Now we translate !0*5 into (not(0))*5. 


mysql-test/r/sp-code.result:
  Adjusted results after the fix of bug 25580.
mysql-test/r/subselect.result:
  Adjusted results after the fix of bug 25580.
mysql-test/r/view.result:
  Added a test case for bug #25580.
mysql-test/t/view.test:
  Added a test case for bug #25580.
sql/item_cmpfunc.cc:
  Fixed bug #25580: incorrect stored representations of views in cases
  when they contain the '!' operator.
  Added an implementation for the method Item_func_not::print. 
  The method encloses the NOT expression into extra parenthesis to avoid
  incorrect stored representations of views that use the '!' operators.
sql/item_cmpfunc.h:
  Fixed bug #25580: incorrect stored representations of views in cases
  when they contain the '!' operator.
  Added an implementation for the method Item_func_not::print. 
  The method encloses the NOT expression into extra parenthesis to avoid
  incorrect stored representations of views that use the '!' operators.
2007-01-17 20:13:45 -08:00
unknown
9a76503704 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


BUILD/check-cpu:
  Auto merged
2007-01-17 17:43:26 -07:00
unknown
e7eb4aa5a7 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50


configure.in:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/buf/buf0flu.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/include/buf0buf.h:
  Auto merged
innobase/include/buf0buf.ic:
  Auto merged
innobase/include/sync0arr.h:
  Auto merged
innobase/include/sync0rw.h:
  Auto merged
innobase/include/sync0rw.ic:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/os/os0sync.c:
  Auto merged
innobase/sync/sync0arr.c:
  Auto merged
innobase/sync/sync0rw.c:
  Auto merged
innobase/sync/sync0sync.c:
  Auto merged
2007-01-17 16:44:10 -07:00
unknown
26010833ea Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
2007-01-17 16:40:41 -07:00
unknown
7d274c052e Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41


configure.in:
  Use local
2007-01-17 16:40:17 -07:00
unknown
bbacca834d Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41


innobase/buf/buf0buf.c:
  Use local
innobase/buf/buf0flu.c:
  Use local
innobase/buf/buf0lru.c:
  Use local
innobase/include/buf0buf.h:
  Use local
innobase/include/buf0buf.ic:
  Use local
innobase/include/sync0arr.h:
  Use local
innobase/include/sync0rw.h:
  Use local
innobase/include/sync0rw.ic:
  Use local
innobase/include/sync0sync.h:
  Use local
innobase/os/os0sync.c:
  Use local
innobase/sync/sync0arr.c:
  Use local
innobase/sync/sync0rw.c:
  Use local
innobase/sync/sync0sync.c:
  Use local
2007-01-17 16:38:49 -07:00
unknown
02af0fa864 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/include/portlib/NdbMem.h:
  Auto merged
ndb/src/common/portlib/NdbMem.c:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
ndb/src/kernel/vm/Configuration.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
2007-01-17 21:18:49 +01:00
unknown
fed5cb6ac8 ndb - bug#25686
add support for doing mlockall before mallc instead of after
  (recommit in 5.0)


ndb/include/portlib/NdbMem.h:
  add support for doing mlockall before mallc instead of after
ndb/src/common/portlib/NdbMem.c:
  add support for doing mlockall before mallc instead of after
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  add support for doing mlockall before mallc instead of after
ndb/src/kernel/vm/Configuration.cpp:
  add support for doing mlockall before mallc instead of after
ndb/src/kernel/vm/Configuration.hpp:
  add support for doing mlockall before mallc instead of after
ndb/src/mgmsrv/ConfigInfo.cpp:
  add support for doing mlockall before mallc instead of after
2007-01-17 21:15:13 +01:00
unknown
f61918ecfb Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-01-17 20:56:01 +01:00
unknown
9cd17b6c92 Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2007-01-17 19:43:46 +01:00
unknown
3125781a8d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


BUILD/check-cpu:
  Auto merged
2007-01-17 13:34:36 -05:00
unknown
55fbeec175 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge


sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2007-01-17 19:30:05 +01:00
unknown
9bca6ffa41 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint


BUILD/check-cpu:
  Auto merged
2007-01-17 13:30:01 -05:00
unknown
158b0603f3 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge


sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2007-01-17 19:28:55 +01:00
unknown
74fa02e80c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721


BitKeeper/deleted/.del-collapsed~fbec3523369aae99:
  Delete: BitKeeper/etc/collapsed
BUILD/check-cpu:
  Auto merged
BitKeeper/etc/collapsed:
  'Auto converge'
2007-01-17 13:24:20 -05:00
unknown
63cb7acee2 Bug#23721: compile fails: check-cpu mishandles cpu flags with \
hyphen in it (like ds-cpl).

convert illegal chars in cpu flags to '_' for variable assignment


BUILD/check-cpu:
  convert illegal chars in cpu flags to '_' for variable assignment
2007-01-17 13:22:50 -05:00
unknown
c9078c40af Disable symlinks under valgrind builds (again), with a comment.
sql/mysqld.cc:
  Once again, disable symlink.test under valgrind builds. symlink.test
  fails deep in mi_repair - the result of this having been disabled
  for almost 5 years.
2007-01-17 20:46:09 +03:00
unknown
2456c61d39 Merge chilla.local:/home/mydev/mysql-4.1--team
into  chilla.local:/home/mydev/mysql-4.1-bug24607
2007-01-17 14:52:36 +01:00
unknown
eeaf11b2f6 Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max


sql/sql_parse.cc:
  SCCS merged
2007-01-17 16:00:33 +03:00
unknown
c2e7e10c32 Merge 192.168.0.10:mysql/mysql-5.0-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
2007-01-17 13:57:45 +01:00
unknown
f7e41baedb Fix a failure of lowercase_tables2 test on powermacg5, introduced
by the patch for Bug#4968


sql/sql_parse.cc:
  Fix lowercase_tables2 test failure on powermacg5: table_case_name()
  function needed create_info.alias if lowercase_table_names=2, which
  was not set for the stack copy of HA_CREATE_INFO. Move the
  update of create_info.alias from create_table_precheck to 
  mysql_execute_command, so that it is done on the right object.
2007-01-17 15:46:30 +03:00
unknown
f8e02a29cd Replace the --exec in a while loop that causes 3400 executions of cygwin/bash on
windows with a small perl script that does exactly the same.
2007-01-17 13:43:03 +01:00
unknown
06bc683652 Fix a ps.test failure in 5.0-runtime tree.
mysql-test/r/ps.result:
  Update result files.
mysql-test/t/ps.test:
  Disable result ouptut of SHOW CREATE TABLE: DATA DIRECTORY option
  may be present or absent from the output depending on the build
  otpions and the operating system, so the output is not consistent
  across supported platforms.
sql/mysqld.cc:
  Remove a tricky #ifdef dependency of --use-symbolic-links on PURIFY
  added in 2002: DEBUG options should not influence server functionality.
  This backfired by producing different output of SHOW CREATE TABLE
  depending on the build options (see also Bug#25677 "With 
  --skip-symbolic-links option on, DATA DIRECTORY clause
  is silently ignored".
2007-01-17 14:24:54 +03:00
unknown
5cebd5c44b Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-engines
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-engines


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysql-test/r/myisam.result:
  SCCS merged
mysql-test/t/myisam.test:
  SCCS merged
2007-01-17 12:24:43 +01:00
unknown
f509e774bc Bug#21122 SHOW CREATE TABLE: directory output only sometimes
Bug #25000  	myisam.test fails on 'pb-valgrind-*' Valgrind
 - Move tests that need symlink to symlink.test


mysql-test/r/myisam.result:
  - Move tests that need symlink to symlink.test
mysql-test/r/symlink.result:
  - Move tests that need symlink to symlink.test
mysql-test/t/myisam.test:
  - Move tests that need symlink to symlink.test
mysql-test/t/symlink.test:
  - Move tests that need symlink to symlink.test
2007-01-17 12:22:00 +01:00
unknown
9352be77a9 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


myisam/mi_packrec.c:
  Auto merged
mysql-test/t/mysqladmin.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_read.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2007-01-17 12:14:34 +01:00
unknown
eb179ebefc Cset exclude: msvensson@pilot.mysql.com|ChangeSet|20070117102733|42618
mysql-test/r/myisam.result:
  Exclude
mysql-test/t/myisam.test:
  Exclude
2007-01-17 12:12:24 +01:00
unknown
e53f3aac02 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2007-01-17 11:53:00 +01:00
unknown
b95f107371 Bug#25505 Myisam library compiler error on Windows
myisam/mi_packrec.c:
  Combine the declaration of variable and assignment into one line
  since that is allowed befgore declaring another variable in C.
2007-01-17 11:51:52 +01:00
unknown
1ce535c6ab Cset exclude: msvensson@neptunus.(none)|ChangeSet|20060825084614|09755
mysql-test/r/myisam.result:
  Exclude
mysql-test/t/myisam.test:
  Exclude
2007-01-17 11:27:33 +01:00
unknown
4743deeba0 Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint


mysql-test/t/mysqladmin.test:
  Auto merged
mysys/mf_iocache.c:
  Auto merged
mysys/my_read.c:
  Auto merged
mysys/my_seek.c:
  Auto merged
sql/sql_parse.cc:
  Auto merged
2007-01-17 11:13:03 +01:00
unknown
4828be9ed6 Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-release
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build
2007-01-17 10:42:57 +01:00
unknown
15eebdc0a1 ha_ndbcluster.cc:
Bug #25668    - corrected patch after test failures


sql/ha_ndbcluster.cc:
  Bug #25668    - corrected patch after test failures
2007-01-17 10:41:52 +01:00
unknown
05527cfcad Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-release
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-build


configure.in:
  Auto merged
2007-01-17 10:07:45 +01:00
unknown
1c24fc3163 ha_ndbcluster.cc:
Bug #25668    ndb: mysqld may core if cluster disconnected
    -- pTrans may be NULL, remove not needed usage of handler::ndb_err


sql/ha_ndbcluster.cc:
    Bug #25668    ndb: mysqld may core if cluster disconnected
    -- pTrans may be NULL, remove not needed usage of handler::ndb_err
2007-01-17 10:06:50 +01:00
unknown
c7fb31ca10 Merge mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-4.1-engines
into  mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.0-engines


myisam/mi_open.c:
  Auto merged
2007-01-17 12:59:54 +04:00
unknown
03df5c1c5b Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
2007-01-17 09:08:20 +01:00
unknown
5383f48796 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
2007-01-17 09:07:12 +01:00
unknown
dbf4dc3da0 myisam/mi_packrec.c
Fix a compile error:  Macro "DBUG_ENTER" must not follow an executable statement.


myisam/mi_packrec.c:
  Fix a compile error:  Macro "DBUG_ENTER" must not follow an executable statement.
2007-01-16 20:01:17 +01:00
unknown
329f6ba1cb Merge bodhi.local:/opt/local/work/mysql-4.1-runtime
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


mysql-test/t/backup.test:
  Auto merged
mysql-test/t/ps.test:
  Manual merge.
2007-01-16 21:31:59 +03:00
unknown
9cff68bb3b A fix for the broken 4.1-runtime tree.
mysql-test/t/backup.test:
  Backport a patch for sporadically failing myisam.test (and now ps.test)
  from 5.0. The cause was in backup.test not cleaning up tables in
  mysqltest-vardir/tmp after itself.
mysql-test/t/ps.test:
  Add additional protection against possible failure in the middle of
  backup.test
2007-01-16 21:23:52 +03:00
unknown
d3cb7a68ea Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
2007-01-16 17:53:45 +01:00
unknown
b461810d63 Update xid's as an effect of not closing the prepared statements all the time 2007-01-16 17:52:17 +01:00
unknown
adff49d95c Don't reuse prepared statements if running with reconnect enabled 2007-01-16 17:47:41 +01:00
unknown
61a2861973 BUG#24855 - Crash mysqld 4.1.21 with corrupted tables
Accessing fixed record format table with crashed key definition results
in server/myisamchk segmentation fault.

This is fixed by refusing to open such tables. Affects MyISAM only.
No test case, since it requires crashed table.


myisam/mi_open.c:
  Refuse to open fixed record format table with key segment that includes
  BLOB part (which is true only for tables with crashed key definition).
2007-01-16 18:05:37 +04:00
unknown
c5a168cfdf Merge neptunus.(none):/home/msvensson/mysql/bug15518/my50-bug15518
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
tests/mysql_client_test.c:
  SCCS merged
2007-01-16 14:13:48 +01:00