Commits · 2987a7029e28e9e58a7ab170e42ad41a62fdc123 · nexedi / MariaDB

16 Jan, 2007 5 commits

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


sql/sql_select.cc:
  Auto merged
```
2987a702

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

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

58ed5cc9

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

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

31839811

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 1309ad53
unknown authored Jan 16, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg20390-2
```
1309ad53
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 1e019609
unknown authored Jan 16, 2007
```
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg20390
```
1e019609

15 Jan, 2007 18 commits

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

Merge bodhi.local:/opt/local/work/tmp_merge · 19eb3f36

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.

19eb3f36

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 1e6c9442
unknown authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
1e6c9442
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 4102755d
unknown authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
4102755d
Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 9d139ae9
unknown authored Jan 15, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


sql/sql_parse.cc:
  Auto merged
```
9d139ae9

A post-merge fix. · e394ffc5

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.

e394ffc5

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

f6015ed5

Merge trift2.:/MySQL/M50/mysql-5.0 · 932a29e7

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

932a29e7

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


sql/sql_select.cc:
  Auto merged
```
a2ce56e7

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

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

adbcc379

Manual merge. · d8adfeeb

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

d8adfeeb

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

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.

8f28774b

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

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

61c9f104

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

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.

bf63b036

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

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

97dbf551

Fix for bug#20390 "SELECT FOR UPDATE does not release locks · 9cfd0e4e

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.

9cfd0e4e

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


configure.in:
  Auto merged
```
04167c4b

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


sql/table.cc:
  Auto merged
```
  6666d439
12 Jan, 2007 16 commits

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

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

ff928c40

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

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

be672162

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

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

26f260a1

Fixed windows build break · 4b6b274c

unknown authored Jan 12, 2007


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

4b6b274c

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

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

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

8e9c245a

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · b0a7bf58
unknown authored Jan 12, 2007
```
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
```
b0a7bf58
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6c42f980
unknown authored Jan 12, 2007
```
into  trift2.:/MySQL/M41/mysql-4.1
```
6c42f980
Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · df17609c
unknown authored Jan 12, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/mysqld.cc:
  Auto merged
```
df17609c

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 39d39734

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

39d39734

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 32d6754e

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

32d6754e

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

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.

ee02d2a6

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


sql/mysqld.cc:
  Auto merged
```
af9f9778
Function mysql_rm_tmp_tables(): · 91cfbda7
unknown authored Jan 12, 2007
```
fixed valgrind error
fixed indentation
```
91cfbda7
Merge trift2.:/MySQL/M41/mysql-4.1 · d64426f6
unknown authored Jan 12, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
d64426f6