Commits · 095e25277e164388dfdfb3b735e931ddd74e7609 · Kirill Smelkov / mariadb

15 Jan, 2007 8 commits

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

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

12 Jan, 2007 9 commits

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

Merge trift2.:/MySQL/M50/mysql-5.0 · 87be629e
unknown authored Jan 12, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
87be629e
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/4.1 · 7a9892cc
unknown authored Jan 12, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0
```
7a9892cc
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 36e7e727
unknown authored Jan 12, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0


sql/mysqld.cc:
  Auto merged
```
36e7e727
Merge trift2.:/MySQL/M41/mysql-4.1 · 4713caa7
unknown authored Jan 12, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
4713caa7

mysql_explain_log.sh: · 3685d889

unknown authored Jan 12, 2007

  Patch from Paul DuBois for better help messages


scripts/mysql_explain_log.sh:
  Patch from Paul DuBois for better help messages

3685d889

11 Jan, 2007 11 commits

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


sql/item_func.cc:
  Auto merged
```
4a819ce1

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

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

6ab5bdf3

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


sql/item_func.cc:
  Auto merged
```
fcbe66a3
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 7f9da471
unknown authored Jan 11, 2007
```
into  rakia.gmz:/home/kgeorge/mysql/autopush/B25106-5.0-opt


sql/sql_base.cc:
  Auto merged
```
7f9da471

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

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.

6c41a043

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

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

b139c287

Many files: · a1566a09

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

a1566a09

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

Merge trift2.:/MySQL/M41/push-4.1 · 0c715c6f

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

0c715c6f

Merge bk@192.168.21.1:mysql-5.0-opt · ce3a76a4
unknown authored Jan 11, 2007
```
into  mysql.com:/d2/hf/mr10/my50-mr10


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

Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.0-sage · 50361d9a

unknown authored Jan 11, 2007

into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0


configure.in:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/mysqld.cc:
  Auto merged
win/configure.js:
  Auto merged

50361d9a

10 Jan, 2007 12 commits

Merge trift2.:/MySQL/M40/clone-4.0 · 34d5b84b

unknown authored Jan 10, 2007

into  trift2.:/MySQL/M41/push-4.1


VC++Files/mysql.dsw:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/libmysqld/libmysqld.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/mysqldemb/mysqldemb.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/mysqlserver/mysqlserver.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/sql/mysqld.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/sql/mysqldmax.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0

34d5b84b

Merge trift2.:/MySQL/M40/upward-4.0 · 6ee56e41

unknown authored Jan 10, 2007

into  trift2.:/MySQL/M41/push-4.1


mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Null merge, because "--platform" is already a real argument in 4.1
support-files/MySQL-shared-compat.spec.sh:
  Null merge, because the 4.1 version already uses two digits
  for "version40" and "version41".

6ee56e41

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-opt · 10698df6
unknown authored Jan 10, 2007
```
into  olga.mysql.com:/home/igor/mysql-4.1-opt
```
10698df6

configure.in: · a4817ace

unknown authored Jan 10, 2007

  Corrected default for --disable-grant-options


configure.in:
  Corrected default for --disable-grant-options

a4817ace

Merge olga.mysql.com:/home/igor/mysql-4.1-opt · 6943153e

unknown authored Jan 10, 2007

into  olga.mysql.com:/home/igor/mysql-5.0-opt


sql/item.cc:
  Auto merged
mysql-test/r/order_by.result:
  Manual merge
mysql-test/t/order_by.test:
  Manual merge

6943153e

Merge bk@192.168.21.1:mysql-5.0 · c11c3b08
unknown authored Jan 10, 2007
```
into  mysql.com:/d2/hf/mr10/my50-mr10
```
c11c3b08

configure.in: · 4ffd49d3

unknown authored Jan 10, 2007

  Removed line accidently inserted when correcting bug#18526


configure.in:
  Removed line accidently inserted when correcting bug#18526

4ffd49d3

Merge mysql.com:/d2/hf/common/my50-common · 380ad35c
unknown authored Jan 10, 2007
```
into  mysql.com:/d2/hf/mr10/my50-mr10
```
380ad35c
after merge fix · 53c9b0d0
unknown authored Jan 10, 2007

53c9b0d0

Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · f5005095

unknown authored Jan 10, 2007

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


sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/mysql_priv.h:
  manual merge

f5005095

Fix for bug#20867 InnoDB Bug - create temporary table+crash => mysqld needs to clean up · ac71a8fa

unknown authored Jan 10, 2007

2nd version
During tmp tables cleanup we get the handler for temporary table
and delete table using handler method.


sql/mysql_priv.h:
  added function prototype
sql/mysqld.cc:
  added call of mysql_rm_tmp_tables() function
sql/sql_base.cc:
  mysql_rm_tmp_tables()
  -removed from table_cache_init
  -During tmp tables cleanup we get the handler for temporary table
   and delete table using handler method. 
   it allows to remove orphan records from data dictionary(InnoDB)

ac71a8fa

Fixed bug #25427. · 6fc17dab

unknown authored Jan 10, 2007

In the method Item_field::fix_fields we try to resolve the name of
the field against the names of the aliases that occur in the select
list. This is done by a call of the function find_item_in_list.
When this function finds several occurrences of the field name
it sends an error message to the error queue and returns 0.
Yet the code did not take into account that find_item_in_list
could return 0 and tried to dereference the returned value.


mysql-test/r/order_by.result:
  Added a test case for bug #25427.
mysql-test/t/order_by.test:
  Added a test case for bug #25427.
sql/item.cc:
  Fixed bug #25427.
  In the method Item_field::fix_fields we try to resolve the name of
  the field against the names of the aliases that occur in the select
  list. This is done by a call of the function find_item_in_list.
  When this function finds several occurrences of the field name 
  it sends an error message to the error queue and returns 0.
  Yet the code did not take into account that find_item_in_list
  could return 0 and tried to dereference the returned value.

6fc17dab