Commits · efbc310af65116e9f2d638a20ee03521ab439516 · Kirill Smelkov / mariadb

26 Oct, 2007 3 commits

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · efbc310a
unknown authored Oct 26, 2007
```
into  mysql.com:/scratch/tnurnberg/31662/51-31662


sql/sql_base.cc:
  Auto merged
```
efbc310a

Merge mysql.com:/scratch/tnurnberg/31662/50-31662 · be4d0626

unknown authored Oct 26, 2007

into  mysql.com:/scratch/tnurnberg/31662/51-31662


mysql-test/r/information_schema_db.result:
  Auto merged
sql/sql_base.cc:
  Auto merged

be4d0626

Bug#31662: 'null' is shown as type of fields for view with bad definer, breaks mysqldump · 0e700e1e

unknown authored Oct 26, 2007

SHOW FIELDS FROM a view with no valid definer was possible (since fix
for Bug#26817), but gave NULL as a field-type. This led to mysqldump-ing
of such views being successful, but loading such a dump with the client
failing. Patch allows SHOW FIELDS to give data-type of field in underlying
table.


mysql-test/r/information_schema_db.result:
  Fix test results: SHOW FIELDS FROM a view with no valid DEFINER
  gives us the field-type of the underlying table now rather than NULL.
sql/sql_base.cc:
  In the case of SHOW FIELDS FROM <view>, do not require a valid
  DEFINER for determining underlying data-type like we usually do.
  This is needed for mysqldump.

0e700e1e

24 Oct, 2007 1 commit
- result fix · f78be6c8
  unknown authored Oct 24, 2007
  
  f78be6c8
23 Oct, 2007 36 commits

result fix · b987945d
unknown authored Oct 23, 2007

b987945d

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

unknown authored Oct 23, 2007

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


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/type_decimal.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  after merge fix

e085211d

Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · fa0e1d6b
unknown authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
fa0e1d6b
after merge fix · 985e4a64
unknown authored Oct 23, 2007

985e4a64

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 95a8bb20

unknown authored Oct 23, 2007

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


client/client_priv.h:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/query_cache.result:
  manual merge
mysql-test/include/mix1.inc:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/query_cache.test:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge

95a8bb20

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 8479eb1d

unknown authored Oct 23, 2007

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


client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/type_datetime.result:
  manual merge
mysql-test/r/type_decimal.result:
  manual merge
mysql-test/t/type_datetime.test:
  manual merge
mysql-test/t/type_decimal.test:
  manual merge
sql/item.cc:
  manual merge

8479eb1d

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 6e8919b0
unknown authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
6e8919b0
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c448d2ed
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
c448d2ed
Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 72bd96ae
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
72bd96ae

Merge mysql.com:/home/hf/work/30638/my50-30638 · f102f668

unknown authored Oct 23, 2007

into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  Auto merged
storage/heap/ha_heap.cc:
  Auto merged

f102f668

Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt · 21469c40
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
21469c40
Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 · de3eb8fb
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
de3eb8fb
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · f7f8ca8b
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
f7f8ca8b
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 2d4639c4
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
2d4639c4
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 619bb76b
unknown authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550


sql/filesort.cc:
  SCCS merged
```
619bb76b
type conversions fixed to get rid of warnings · 4e5c8bc7
unknown authored Oct 23, 2007
```
sql/ha_heap.cc:
  type conversion fix
sql/opt_range.cc:
  type conversion fix
```
4e5c8bc7
Merge mysql.com:/home/hf/work/30638/my50-30638 · 0fb0e7ac
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
0fb0e7ac
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 0c77be95
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
0c77be95
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 09c8f3e6
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
```
09c8f3e6
merge 5.0-opt -> 5.1-opt for bug 30825 · 6875b402
unknown authored Oct 23, 2007

6875b402
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 73d08e3a
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
73d08e3a
Merge mysql.com:/home/hf/work/30638/my50-30638 · 707fd691
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638


sql/opt_range.cc:
  merging
```
707fd691
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · bfa5dd2f
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
```
bfa5dd2f
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 084753af
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
084753af
type conversion fixed to get rid of warnings · 8262c4f4
unknown authored Oct 23, 2007
```
sql/opt_range.cc:
  type conversion fixed
```
8262c4f4
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a9a50c72
unknown authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
a9a50c72
merging · dafb9894
unknown authored Oct 23, 2007

dafb9894
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 8a790dd1
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
8a790dd1
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · b249d2a7
unknown authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
b249d2a7

Merge mysql.com:/home/hf/work/30638/my50-30638 · 51fddf75

unknown authored Oct 23, 2007

into  mysql.com:/home/hf/work/30638/my51-30638


sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_write.c:
  Auto merged
storage/myisam/sort.c:
  Auto merged
sql/opt_range.cc:
  merging
sql/sql_map.cc:
  merging
storage/federated/ha_federated.cc:
  merging
storage/heap/ha_heap.cc:
  merging

51fddf75

type conversions fixed to avoid warnings on Windows · e1dc86b0

unknown authored Oct 23, 2007


myisam/mi_write.c:
  type conversion fixed
myisam/sort.c:
  type conversion fixed
sql/ha_federated.cc:
  type conversion fixed
sql/ha_heap.cc:
  type conversion fixed
sql/ha_innodb.cc:
  type conversion fixed
sql/ha_myisam.cc:
  type conversion fixed
sql/opt_range.cc:
  type conversion fixed
sql/sql_map.cc:
  type conversion fixed
sql/sql_select.cc:
  type conversion fixed
sql/sql_update.cc:
  type conversion fixed

e1dc86b0

Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 31634a38
unknown authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
```
31634a38

Merge magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt · c5dfd3e1

unknown authored Oct 23, 2007

into  magare.gmz:/home/kgeorge/mysql/work/B30825-5.1-opt


mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
BitKeeper/deleted/.del-bdb_gis.result:
  Auto merged
BitKeeper/deleted/.del-bdb_gis.test:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/innodb_gis.result:
  merged 5.0-opt -> 5.1-opt
mysql-test/t/innodb_gis.test:
  merged 5.0-opt -> 5.1-opt
sql/field.cc:
  merged 5.0-opt -> 5.1-opt
sql/field.h:
  merged 5.0-opt -> 5.1-opt
sql/sql_select.h:
  merged 5.0-opt -> 5.1-opt
sql/sql_yacc.yy:
  merged 5.0-opt -> 5.1-opt
sql/table.cc:
  merged 5.0-opt -> 5.1-opt

c5dfd3e1

Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 933bf869

unknown authored Oct 23, 2007

into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt


sql/field.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

933bf869

Merge magare.gmz:/home/kgeorge/mysql/work/B28687-5.0-opt · e7acb3ac

unknown authored Oct 23, 2007

into  magare.gmz:/home/kgeorge/mysql/work/B28687-5.1-opt


mysql-test/t/type_date.test:
  Auto merged
mysql-test/r/type_date.result:
  merge 5.0-opt -> 5.1-opt
sql/item.cc:
  merge 5.0-opt -> 5.1-opt

e7acb3ac

Bug#31633 Information schema = NULL queries crash the server · 565c105c

unknown authored Oct 23, 2007

added correct handling of NULL values for lookup fields


mysql-test/r/information_schema.result:
  test result
mysql-test/t/information_schema.test:
  test case
sql/sql_show.cc:
  added correct handling of NULL values for lookup fields

565c105c