Commits · 19eb3f36b0f2843f6eef7d309285bc439a38cc7f · nexedi / MariaDB

15 Jan, 2007 3 commits

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 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

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 15 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 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

11 Jan, 2007 21 commits

Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 799f1aba

unknown authored Jan 11, 2007

into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build


configure.in:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged

799f1aba

Bug#22687 (Functions UNIQUE_USERS, GROUP_UNIQUE_USERS) · 6bc93745

unknown authored Jan 11, 2007

According to some internal communication, these two functions are place
holders for future enhancements. Because they use a variable number of
parameters, the implementation defined a reserved keyword for them in the
parser grammar.

Unfortunately, doing so creates a bug similar to Bug 21114 reported for the
function FORMAT.

In the 5.1 code base, due to improvements in the code implemented with bug
21114, having a reserved keyword for functions with a variable number of
arguments is not needed any more by the implementation.

As a result, this fix removes the place-holder implementation, and removes
the unnecessary reserved keywords. Should the functions UNIQUE_USERS and
GROUP_UNIQUE_USERS be finally implemented in a later release, the
implementation should sub class Create_native_func in sql/item_create.cc.
For example, see the class Create_func_concat.


BitKeeper/deleted/.del-item_uniq.cc:
  Rename: sql/item_uniq.cc -> BitKeeper/deleted/.del-item_uniq.cc
BitKeeper/deleted/.del-item_uniq.h:
  Rename: sql/item_uniq.h -> BitKeeper/deleted/.del-item_uniq.h
libmysqld/Makefile.am:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
mysql-test/r/parser.result:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
mysql-test/t/parser.test:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/Makefile.am:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/item.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/item_sum.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/lex.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/mysql_priv.h:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().
sql/sql_yacc.yy:
  Remove native functions UNIQUE_USERS() and GROUP_UNIQUE_USERS().

6bc93745

Merge siva.hindu.god:/home/tsmith/m/bk/mysql-5.0-build · ea72c946

unknown authored Jan 11, 2007

into  siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build


BitKeeper/deleted/.del-CMakeLists.txt~3:
  Auto merged
BitKeeper/deleted/.del-README~1:
  Auto merged
BitKeeper/deleted/.del-configure.js:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
configure.in:
  Manual merge
mysql-test/install_test_db.sh:
  Manual merge
sql/mysqld.cc:
  Manual merge

ea72c946

Merge trift2.:/MySQL/M50/tmp-5.0 · 32a5f7d0

unknown authored Jan 11, 2007

into  trift2.:/MySQL/M51/push-5.1


mysys/my_read.c:
  Auto merged
BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e:
  Auto merged
BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149:
  Null merge.
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Null merge.
BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
  Null merge.
BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e:
  Null merge.
BitKeeper/deleted/.del-mysqlserver.dsp~d99cfb2d291e3785:
  Null merge.
scripts/make_binary_distribution.sh:
  Null merge, this change is already suppressed in 4.1.
support-files/MySQL-shared-compat.spec.sh:
  Null merge, this change is already suppressed in 4.1.

32a5f7d0

Merge trift2.:/MySQL/M50/tmp1-5.0 · 9dc14298
unknown authored Jan 11, 2007
```
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
```
9dc14298

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

unknown authored Jan 11, 2007

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


mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
mysql-test/r/csv.result:
  Manual merge.
mysql-test/t/csv.test:
  Manual merge.

3d904a85

Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 090f88f9
unknown authored Jan 11, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime


sql/item_func.cc:
  Auto merged
```
090f88f9

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

unknown authored Jan 11, 2007

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


heap/hp_block.c:
  Auto merged
mysql-test/r/view.result:
  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
tests/mysql_client_test.c:
  Auto merged
heap/hp_write.c:
  SCCS merged

39205fb3

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 22c61cba
unknown authored Jan 11, 2007
```
into  bodhi.local:/opt/local/work/mysql-4.1-runtime


sql/item_func.cc:
  Auto merged
```
22c61cba
Merge trift2.:/MySQL/M51/mysql-5.1 · 0eb0c6e8
unknown authored Jan 11, 2007
```
into  trift2.:/MySQL/M51/push-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
```
0eb0c6e8
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 054be5a0
unknown authored Jan 11, 2007
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt


sql/sql_base.cc:
  Auto merged
```
054be5a0

BUG#25106: A USING clause in combination with a VIEW results in column · ba013b9d

unknown authored Jan 11, 2007

           aliases ignored
When a column reference to a column in JOIN USING is resolved and a new 
Item is created for this column the user defined name was lost.
This fix preserves the alias by setting the name of the new Item to the
original alias.


mysql-test/r/join.result:
  BUG#25106: A USING clause in combination with a VIEW results in column
             aliases ignored
   - test case
mysql-test/t/join.test:
  BUG#25106: A USING clause in combination with a VIEW results in column
             aliases ignored
   - test case
sql/sql_base.cc:
  BUG#25106: A USING clause in combination with a VIEW results in column
             aliases ignored
   - take the alias of the Item to be replaced and set it into the newly
     allocated Item.

ba013b9d

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 19678b2f

unknown authored Jan 11, 2007

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


sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

19678b2f

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 77760784
unknown authored Jan 11, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
77760784
after merge fix · 110639c2
unknown authored Jan 11, 2007

110639c2

Merge mysql.com:/home/kent/bk/tmp2/mysql-4.1-build · be33e018

unknown authored Jan 11, 2007

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


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

be33e018

Many files: · dbc660f1

unknown authored Jan 11, 2007

  Reverted change for bug#13859, applied smaller patch from Marko


innobase/buf/buf0buf.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/dict/dict0dict.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/fil/fil0fil.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/ha/ha0ha.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/ha/hash0hash.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/include/hash0hash.h:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/lock/lock0lock.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/log/log0recv.c:
  Reverted change for bug#13859, applied smaller patch from Marko
innobase/thr/thr0loc.c:
  Reverted change for bug#13859, applied smaller patch from Marko

dbc660f1

Merge trift2.:/MySQL/M50/mysql-5.0 · f254855b
unknown authored Jan 11, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
f254855b

Merge trift2.:/MySQL/M41/push-4.1 · caed3b57

unknown authored Jan 11, 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
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged

caed3b57

Merge bk@192.168.21.1:mysql-5.1-opt · f4bad3ce
unknown authored Jan 11, 2007
```
into  mysql.com:/d2/hf/mr10/my51-mr10


mysql-test/t/csv.test:
  Auto merged
```
f4bad3ce
Merge bk@192.168.21.1:mysql-5.0-opt · a8e42cdb
unknown authored Jan 11, 2007
```
into  mysql.com:/d2/hf/mr10/my50-mr10


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