Commits · adfbe1fb82d43e0e22d56a29cccfe71ff72eb802 · Kirill Smelkov / mariadb

17 Dec, 2007 7 commits

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · adfbe1fb

unknown authored Dec 17, 2007

into  mysql.com:/misc/mysql/31752_/51-31752_


client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

adfbe1fb

Merge mysql.com:/misc/mysql/31752_/50-31752_ · ba050667

unknown authored Dec 17, 2007

into  mysql.com:/misc/mysql/31752_/51-31752_


mysys/mf_pack.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/unireg.cc:
  Auto merged

ba050667

Merge mysql.com:/misc/mysql/31752_/41-31752_ · 02cdb7ec

unknown authored Dec 17, 2007

into  mysql.com:/misc/mysql/31752_/50-31752_


mysys/mf_pack.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_show.cc:
  manual merge
sql/unireg.cc:
  manual merge

02cdb7ec

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 734c6286
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32350/51-32350


client/mysqldump.c:
  Auto merged
```
734c6286
Merge mysql.com:/misc/mysql/32350/50-32350 · 309845de
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32350/51-32350


client/mysqldump.c:
  Auto merged
```
309845de
Merge mysql.com:/misc/mysql/32350/41-32350 · 8d495f57
unknown authored Dec 17, 2007
```
into  mysql.com:/misc/mysql/32350/50-32350


client/mysqldump.c:
  Auto merged
```
8d495f57

Bug#32350: mysqldump should show more version information in output · ef280203

unknown authored Dec 17, 2007

show version of mysqldump, release of server et al., and version of
current server in mysqldumps.


client/mysqldump.c:
  show version of mysqldump, release of server et al., and version of
  current server in mysqldumps.

ef280203

15 Dec, 2007 1 commit

Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt · 86138a28

unknown authored Dec 15, 2007

into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my51-bug32798-united-push


sql/item_sum.cc:
  Auto merged
mysql-test/r/func_gconcat.result:
  Bug#32798: Manual merge.
mysql-test/t/func_gconcat.test:
  Bug#32798: Manual merge.

86138a28

14 Dec, 2007 4 commits

Bug#32798: DISTINCT in GROUP_CONCAT clause fails when ordering by · 146b317d
unknown authored Dec 14, 2007
```
a column with null values

Post-merge fix


sql/item_sum.cc:
  Bug#32798:Post-merge fix
```
146b317d

Merge linux-st28.site:/home/martin/mysql/src/bug32798-united/my50-bug32798-united · a9e05bf7

unknown authored Dec 14, 2007

into  linux-st28.site:/home/martin/mysql/src/bug32798-united/my51-bug32798-united


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Manual merge, Field::cmp has argument type const uchar* in 5.1
sql/item_sum.h:
  manual merge

a9e05bf7

Bug#32798: DISTINCT in GROUP_CONCAT clause fails when ordering by a column · 0c4b3f57

unknown authored Dec 14, 2007

with null values

For queries containing GROUP_CONCAT(DISTINCT fields ORDER BY fields), there 
was a limitation that the DISTINCT fields had to be the same as ORDER BY 
fields, owing to the fact that one single sorted tree was used for keeping 
track of tuples, ordering and uniqueness. Fixed by introducing a second 
structure to handle uniqueness so that the original structure has only to 
order the result.


mysql-test/r/func_gconcat.result:
  Bug#32798:
  - Wrong test result turned correct after fix.
  - Correct test result
mysql-test/t/func_gconcat.test:
  Bug#32798: Test case
sql/item_sum.cc:
  Bug#32798: Implementation of fix. Dead code removal.
  
  - removed comment describing this bug
  - replaced body of function group_concat_key_cmp_with_distinct
  - removed function group_concat_key_cmp_with_distinct_and_order
  - Added a Unique object to maintain uniqueness of values.
sql/item_sum.h:
  Bug#32798: Declarations and comments.

0c4b3f57

Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · fe34eb34

unknown authored Dec 14, 2007

into  dl145s.mysql.com:/data0/mhansson/my51-bug32858


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

fe34eb34

13 Dec, 2007 18 commits

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

unknown authored Dec 13, 2007

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


storage/blackhole/ha_blackhole.cc:
  use local

35742460

additional fix · 12504d90
unknown authored Dec 13, 2007

12504d90

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

unknown authored Dec 13, 2007

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


storage/blackhole/ha_blackhole.cc:
  use local

ab088404

additional after merge fix · f61f5f72

unknown authored Dec 13, 2007


mysql-test/r/partition_range.result:
  removed fix for bug#30573
mysql-test/suite/parts/r/rpl_partition.result:
  updated result file
mysql-test/t/partition_range.test:
  removed test case for bug#30573
sql/ha_partition.cc:
  removed fix for bug#30573

f61f5f72

valgrind error fix · e51e6097
unknown authored Dec 13, 2007

e51e6097
after merge fix · 0cc269da
unknown authored Dec 13, 2007

0cc269da
after merge fix · f7f96cd2
unknown authored Dec 13, 2007

f7f96cd2

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 214ea206

unknown authored Dec 13, 2007

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


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
mysql-test/include/mix1.inc:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/r/range.result:
  manual merge
sql/item_cmpfunc.cc:
  manual merge

214ea206

Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 63a67ee0

unknown authored Dec 13, 2007

into  dl145s.mysql.com:/data0/mhansson/my51-bug32858


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

63a67ee0

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 9a10c20b

unknown authored Dec 13, 2007

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


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/queues.c:
  Auto merged
sql/events.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  manual merge
mysql-test/r/myisam.result:
  manual merge
mysql-test/r/partition.result:
  manual merge
mysql-test/r/user_var.result:
  manual merge
mysql-test/t/myisam.test:
  manual merge
mysql-test/t/partition.test:
  manual merge
mysql-test/t/user_var.test:
  manual merge
sql/item.h:
  manual merge
sql/item_func.cc:
  manual merge
storage/myisammrg/ha_myisammrg.cc:
  manual merge

9a10c20b

after merge fix · f1d98054
unknown authored Dec 13, 2007

f1d98054

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

unknown authored Dec 13, 2007

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


include/mysql_com.h:
  Auto merged
myisam/mi_check.c:
  Auto merged

4618000b

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 33f82b17

unknown authored Dec 13, 2007

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


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/func_misc.result:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/t/func_misc.test:
  manual merge
mysql-test/t/innodb_mysql.test:
  manual merge
sql/sql_insert.cc:
  manual merge

33f82b17

Merge linux-st28.site:/home/martin/mysql/src/bug32858/my50-bug32858 · 0b2336c5

unknown authored Dec 13, 2007

into  linux-st28.site:/home/martin/mysql/src/bug32858/my51-bug32858


mysql-test/r/union.result:
  null merge
mysql-test/t/union.test:
  null merge.
sql/sql_class.cc:
  null merge.
sql/sql_class.h:
  null merge.
sql/sql_yacc.yy:
  null merge.

0b2336c5

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 196f0c75
unknown authored Dec 13, 2007
```
into  mysql.com:/home/psergey/mysql-5.0-bug32198
```
196f0c75

BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly · c6675cd1

unknown authored Dec 13, 2007

- Make conditions like "date_col $CMP$ 'datetime-const'" range-sargable


mysql-test/r/range.result:
  BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
  - Testcase
mysql-test/t/range.test:
  BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
  - Testcase
sql/field.cc:
  BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
  - Added comments

c6675cd1

Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 618cb7a8

unknown authored Dec 13, 2007

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


include/mysql_com.h:
  Auto merged
myisam/mi_check.c:
  Auto merged

618cb7a8

Bug #32858: Erro: "Incorrect usage of UNION and INTO" does not take · 93e3057b

unknown authored Dec 13, 2007

subselects into account

It is forbidden to use the SELECT INTO construction inside UNION statements
unless on the last SELECT of the union. The parser records whether it 
has seen INTO or not when parsing a UNION statement. But if the INTO was
legally used in an outer query, an error is thrown if UNION is seen in a
subquery. Fixed in 5.0 by remembering the nesting level of INTO tokens and 
mitigate the error unless it collides with the UNION.


mysql-test/r/union.result:
  Bug#32858: Test result
mysql-test/t/union.test:
  Bug#32858: Test case
sql/sql_class.cc:
  Bug#32858: Initializing new member
sql/sql_class.h:
  Bug#32858: Added property nest_level to select_result class.
sql/sql_yacc.yy:
  Bug#32858: The fix.

93e3057b

12 Dec, 2007 2 commits
- Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 0d5caaa4
  unknown authored Dec 12, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/t/merge.test:
  Auto merged
```
  0d5caaa4
- Dummy push to help pushbuild running again. · 0ced2a4d
  unknown authored Dec 12, 2007
```
Fixed case of comment.


mysql-test/t/merge.test:
  Fixed case of comment.
```
  0ced2a4d
11 Dec, 2007 8 commits

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 573353c2
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
573353c2
Merge stella.local:/home2/mydev/mysql-5.1-amain · d538409a
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
d538409a
Merge stella.local:/home2/mydev/mysql-5.1-ateam · 223e57de
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg


sql/sql_table.cc:
  Auto merged
```
223e57de
Merge stella.local:/home2/mydev/mysql-5.0-amain · 6f568e0a
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
6f568e0a

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 961e5d3d

unknown authored Dec 11, 2007

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged

961e5d3d

Merge stella.local:/home2/mydev/mysql-5.1-bug30273 · 82af0276

unknown authored Dec 11, 2007

into  stella.local:/home2/mydev/mysql-5.1-axmrg


sql/lock.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged

82af0276

Merge stella.local:/home2/mydev/mysql-5.1-amain · 19c7e2c9

unknown authored Dec 11, 2007

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/t/disabled.def:
  Auto merged
sql/partition_info.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
mysql-test/r/func_misc.result:
  SCCS merged
mysql-test/t/func_misc.test:
  SCCS merged

19c7e2c9

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 6e58bd40
unknown authored Dec 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1


configure.in:
  merge fix
```
6e58bd40