Commits · b1cd0571d1441d80e552e41defe226f2b6cc5ea0 · Kirill Smelkov / mariadb

16 Jan, 2007 8 commits

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · b1cd0571

unknown authored Jan 16, 2007

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/t/ps.test:
  Use local.
mysql-test/t/backup.test:
  SCCS merged

b1cd0571

Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 329f6ba1

unknown authored Jan 16, 2007

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


mysql-test/t/backup.test:
  Auto merged
mysql-test/t/ps.test:
  Manual merge.

329f6ba1

A fix for the broken 4.1-runtime tree. · 9cff68bb

unknown authored Jan 16, 2007


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

9cff68bb

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 4f4385d6
unknown authored Jan 16, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/sql_select.cc:
  Auto merged
```
4f4385d6

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · 3634cce7

unknown authored Jan 16, 2007

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Auto merged
BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  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/ha/ha0ha.c:
  Auto merged
storage/innobase/include/hash0hash.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged
configure.in:
  Use local
sql/sql_parse.cc:
  Use local
sql/sql_table.cc:
  Use local
mysql-test/t/ps.test:
  SCCS merged

3634cce7

Merge bodhi.local:/opt/local/work/mysql-5.1-root · 7017cb07

unknown authored Jan 16, 2007

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

7017cb07

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 22f62e8a
unknown authored Jan 16, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
```
22f62e8a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 061ea692
unknown authored Jan 16, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
```
061ea692

15 Jan, 2007 18 commits

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · f71b6a84
unknown authored Jan 15, 2007
```
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-6298
```
f71b6a84

Merge bodhi.local:/opt/local/work/tmp_merge · c8fccee6

unknown authored Jan 15, 2007

into  bodhi.local:/opt/local/work/mysql-5.1-root


BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Auto merged
mysql-test/r/view.result:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/heap/hp_block.c:
  Auto merged
storage/heap/hp_write.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/ha/ha0ha.c:
  Auto merged
storage/innobase/include/hash0hash.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  SCCS merged
mysql-test/t/view.test:
  Manual merge.

c8fccee6

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 095e2527
unknown authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
095e2527
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ce3a483d
unknown authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
ce3a483d
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 2ba119c6
unknown authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


sql/sql_parse.cc:
  Auto merged
```
2ba119c6

A post-merge fix. · 15c83425

unknown authored Jan 15, 2007


sql/sql_parse.cc:
  A post-merge fix (broken alter_table.test): restore Svoj's fix
  for Bug#23404 lost during merge.

15c83425

Raise version number after cloning 5.0.34 · 7118b2c3
unknown authored Jan 15, 2007

7118b2c3

Merge trift2.:/MySQL/M50/mysql-5.0 · 60348574

unknown authored Jan 15, 2007

into  trift2.:/MySQL/M50/push-5.0


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
VC++Files/sql/mysqldmax.dsp:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/include/hash0hash.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged

60348574

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 54df7b90
unknown authored Jan 15, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
```
54df7b90
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 96e5be8c
unknown authored Jan 15, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2


sql/sql_select.cc:
  Auto merged
```
96e5be8c

Merge bodhi.local:/opt/local/work/mysql-4.1-4968-to-push · 30393ec4

unknown authored Jan 15, 2007

into  bodhi.local:/opt/local/work/mysql-5.0-4968-to-push


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Use local

30393ec4

Manual merge. · 408d7752

unknown authored Jan 15, 2007


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

408d7752

Merge bk-internal.mysql.com:/home/bk/mysql-4.1-runtime · d470c233

unknown authored Jan 15, 2007

into  bodhi.local:/opt/local/work/mysql-4.1-4968-to-push


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge.
sql/sql_table.cc:
  Manual merge.

d470c233

Merge bodhi.local:/opt/local/work/mysql-5.0-4968-pull-from-4.1 · d099d94e

unknown authored Jan 15, 2007

into  bodhi.local:/opt/local/work/mysql-5.1-4968-null-merge


mysql-test/r/ps.result:
  Use local.
mysql-test/r/sp.result:
  Use local
mysql-test/t/ps.test:
  Use local
mysql-test/t/sp.test:
  Use local
sql/mysql_priv.h:
  Use local
sql/sql_class.h:
  Use local
sql/sql_insert.cc:
  Use local
sql/sql_lex.cc:
  Use local
sql/sql_lex.h:
  Use local
sql/sql_list.h:
  Use local
sql/sql_parse.cc:
  Use local
sql/sql_show.cc:
  Use local
sql/sql_table.cc:
  Use local
sql/sql_yacc.yy:
  Use local

d099d94e

Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2 · b523c895

unknown authored Jan 15, 2007

into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390


mysql-test/t/ndb_lock.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/ndb_lock.result:
  Manual merge.

b523c895

Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build · ffbb896b

unknown authored Jan 15, 2007

into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build


mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Auto merged
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
  Auto merged
storage/innobase/buf/buf0buf.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/ha/ha0ha.c:
  Auto merged
storage/innobase/ha/hash0hash.c:
  Auto merged
storage/innobase/include/hash0hash.h:
  Auto merged
storage/innobase/lock/lock0lock.c:
  Auto merged
storage/innobase/log/log0recv.c:
  Auto merged
storage/innobase/thr/thr0loc.c:
  Auto merged

ffbb896b

Fix for bug#20390 "SELECT FOR UPDATE does not release locks · 810fc001

unknown authored Jan 15, 2007

of untouched rows in full table scans".

SELECT ... FOR UPDATE/LOCK IN SHARE MODE statements as well as
UPDATE/DELETE statements which were executed using full table
scan were not releasing locks on rows which didn't satisfy
WHERE condition.
This bug surfaced in 5.0 and affected NDB tables. (InnoDB tables
intentionally don't support such unlocking in default mode).

This problem occured because code implementing join didn't call
handler::unlock_row() for rows which didn't satisfy part of condition
attached to this particular table/level of nested loop. So we solve
the problem adding this call.
Note that we already had this call in place in 4.1 but it was lost
(actually not quite correctly placed) when we have introduced nested 
joins.

Also note that additional QA should be requested once this patch is
pushed as interaction between handler::unlock_row() and many recent
MySQL features such as subqueries, unions, views is not tested enough.


mysql-test/r/ndb_lock.result:
  Enabled back part of the test that covers bug #20390 "SELECT FOR
  UPDATE does not release locks of untouched rows in full table scans".
  Adjusted test in such way that it now covers both execution paths
  in which we unlock non-matching rows inspected during table scan.
mysql-test/t/ndb_lock.test:
  Enabled back part of the test that covers bug #20390 "SELECT FOR
  UPDATE does not release locks of untouched rows in full table scans".
  Adjusted test in such way that it now covers both execution paths
  in which we unlock non-matching rows inspected during table scan.
sql/sql_select.cc:
  evaluate_join_record() should call handler::unlock_row() for records
  which don't satisfy condition which was pushed-down to this table/level
  of nested loop.
  We just put back the thing that we already have in 4.1 and which was lost
  when we have introduced nested joins.

810fc001

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 32b01395
unknown authored Jan 15, 2007
```
into  mysql.com:/home/kent/bk/tmp2/mysql-5.1-build


configure.in:
  Auto merged
```
32b01395

14 Jan, 2007 1 commit
- Merge trift2.:/MySQL/M51/mysql-5.1 · 5e64051b
  unknown authored Jan 14, 2007
```
into  trift2.:/MySQL/M51/tmp-5.1


sql/table.cc:
  Auto merged
```
  5e64051b
12 Jan, 2007 13 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 68bd8af2

unknown authored Jan 12, 2007

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/t/csv.test:
  Auto merged
server-tools/instance-manager/guardian.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

68bd8af2

Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 31e01f0a

unknown authored Jan 12, 2007

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
VC++Files/sql/mysqldmax.dsp:
  Auto merged
innobase/buf/buf0buf.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/include/hash0hash.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged

31e01f0a

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · fc681ea7

unknown authored Jan 12, 2007

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


sql/item_func.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged

fc681ea7

Fixed windows build break · 9c06a0b3

unknown authored Jan 12, 2007


sql/CMakeLists.txt:
  Fixed windows build break, file item_uniq.cc has been removed.

9c06a0b3

Merge trift2.:/MySQL/M50/mysql-5.0 · 87be629e
unknown authored Jan 12, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
87be629e

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 8f5e92e0

unknown authored Jan 12, 2007

into  weblab.(none):/home/marcsql/TREE/mysql-5.1-22687


libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
BitKeeper/deleted/.del-item_uniq.cc:
  Auto merged
BitKeeper/deleted/.del-item_uniq.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

8f5e92e0

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f9a8075
unknown authored Jan 12, 2007
```
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
```
5f9a8075
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 611299bb
unknown authored Jan 12, 2007
```
into  trift2.:/MySQL/M41/mysql-4.1
```
611299bb
Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 2cc1c479
unknown authored Jan 12, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/mysqld.cc:
  Auto merged
```
2cc1c479

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 5a809546

unknown authored Jan 12, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
mysql-test/r/join.result:
  manual merge
mysql-test/t/join.test:
  manual merge

5a809546

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · cf76bb51

unknown authored Jan 12, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/mysqld.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged

cf76bb51

Bug#24660: "enum" field type definition problem · cf0857d0

unknown authored Jan 12, 2007

ENUMs weren't allowed to have character 0xff, a perfectly good
character in some locales.  This was circumvented by mapping 0xff in
ENUMs to ',', thereby prevent actual commas from being used. Now if
0xff makes an appearance, we find a character not used in the enum and
use that as a separator. If no such character exists, we throw an
error.

Any solution would have broken some sort of existing behaviour. This
solution should serve both fractions (those with 0xff and those with
',' in their enums), but WILL REQUIRE A DUMP/RESTORE CYCLE FROM THOSE
WITH 0xff IN THEIR ENUMS. :-/ That is, mysqldump with their current
server, and restore when upgrading to one with this patch.


mysql-test/r/type_enum.result:
  Bug#24660: "enum" field type definition problem
  
  Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
  char in some locales), or ',', or both.
mysql-test/t/type_enum.test:
  Bug#24660: "enum" field type definition problem
  
  Show that enums can now contain NAMES_SEP_CHAR (0xff, which is a perfectly respectable
  char in some locales), or ',', or both.
sql/table.cc:
  Bug#24660: "enum" field type definition problem
  
  Revert fix for Bug#20922.
sql/unireg.cc:
  Bug#24660: "enum" field type definition problem
  
  Use a field-separator for ENUM-values that is not part of those values. If impossible,
  throw error.

cf0857d0

Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 7a9892cc
unknown authored Jan 12, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0
```
7a9892cc