Commits · 096f9afac356ffbba7c7742e169af6f718de7d08 · nexedi / MariaDB

18 Oct, 2007 1 commit

Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-base · 096f9afa

unknown authored Oct 18, 2007

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge


client/mysqlcheck.c:
  Auto merged
client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

096f9afa

17 Oct, 2007 6 commits

Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 988fad13
unknown authored Oct 17, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


libmysql/libmysql.c:
  Auto merged
```
988fad13

Fix syntax error build problem on Windows (variable was defined · 2a65aba5

unknown authored Oct 17, 2007

in middle of block)


libmysql/libmysql.c:
  Fix syntax error - don't define new variables in the middle of a block.
  
  Also, use size_t instead of uint to avoid unnecessary casting.

2a65aba5

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · 5940e90a

unknown authored Oct 17, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


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

5940e90a

Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint · 1451a0eb

unknown authored Oct 17, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


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

1451a0eb

Fixed the test case for bug #31174 to not fail on 64-bit platforms. · 211aaf1f
unknown authored Oct 17, 2007

211aaf1f

Manual merge of 5.0-runtime to 5.1-runtime · 40ea2b48

unknown authored Oct 16, 2007


mysql-test/r/sp-error.result:
  Manual merge
mysql-test/r/sp.result:
  Manual merge
mysql-test/r/udf.result:
  Manual merge
mysql-test/t/sp.test:
  Manual merge
mysql-test/t/udf.test:
  Manual merge
sql/item_create.cc:
  Manual merge
sql/sp_head.cc:
  Manual merge
sql/sql_yacc.yy:
  Manual merge

40ea2b48

16 Oct, 2007 13 commits

Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-runtime · 4466dec3

unknown authored Oct 16, 2007

into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.1-rt-merge


mysql-test/t/sp-error.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
mysql-test/r/sp-error.result:
  failed auto merge
mysql-test/r/sp.result:
  failed auto merge
mysql-test/r/udf.result:
  failed auto merge
mysql-test/t/sp.test:
  failed auto merge
sql/sp_head.cc:
  failed auto merge
sql/sql_yacc.yy:
  failed auto merge

4466dec3

Fixed broken call to my_error · 623e5187
unknown authored Oct 16, 2007
```
sql/sql_yacc.yy:
  Fixed error message to use char*, not LEX_STRING
```
623e5187
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 66fe631b
unknown authored Oct 16, 2007
```
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
```
66fe631b

Fixed query_cache_notembedded test program failure because of dependencies between · ed6fe847

unknown authored Oct 16, 2007

test programs.


mysql-test/r/query_cache.result:
  Reset query cache parameters to prevent dependency between test programs.
mysql-test/t/query_cache.test:
  Reset query cache parameters to prevent dependency between test programs.

ed6fe847

Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · fd5bd91a
unknown authored Oct 16, 2007
```
into  lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-28318-rework
```
fd5bd91a

Implementing code review comments · 473e6285

unknown authored Oct 16, 2007


mysql-test/r/sp.result:
  Added tests for coverage
mysql-test/t/sp.test:
  Added tests for coverage
sql/sql_udf.cc:
  Code cleanup

473e6285

Update the client ABI to reflect member rename · 3459ae14

unknown authored Oct 16, 2007

(this is a backward-compatible change).


include/mysql_h.ic:
  Update the ABI to reflect member rename 
  (this is a backward-compatible change).

3459ae14

Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · 3a294bf7

unknown authored Oct 16, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint


storage/myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  SCCS merged
mysql-test/t/repair.test:
  SCCS merged

3a294bf7

Merge polly.(none):/home/kaa/src/maint/mysql-4.1-maint · 47d6d92d

unknown authored Oct 16, 2007

into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint


myisam/sort.c:
  Auto merged
mysql-test/r/repair.result:
  Auto merged
mysql-test/t/repair.test:
  Auto merged

47d6d92d

Merge polly.(none):/home/kaa/src/maint/bug31174/my41-bug31174 · 40fe4b6e
unknown authored Oct 16, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-4.1-maint
```
40fe4b6e
Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 0deedab4
unknown authored Oct 16, 2007
```
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
```
0deedab4

Bug#30710 query_cache.test fails on embedded - per-column privs test · 27324e11

unknown authored Oct 16, 2007

The embedded version of the server doesn't use column level grants, and 
the compile directive NO_EMBEDDED_ACCESS_CHECKS should be checked instead of
the redundant HAVE_QUERY_CACHE (which is always the case) to determine if 
column level grants should be compiled or not.


mysql-test/r/query_cache.result:
  Updated result file
mysql-test/r/query_cache_notembedded.result:
  Updated result file
mysql-test/t/query_cache.test:
  Moved test with GRANT to query_cache_notembedded test.
mysql-test/t/query_cache_notembedded.test:
  Moved test with GRANT to query_cache_notembedded test.
sql/sql_cache.cc:
  Changed the conditional compilation directive to only compile column level grant
  checks if NO_EMBEDDED_ACCESS_CHECKS isn't defined.

27324e11

Bug#28318 (CREATE FUNCTION (UDF) requires a schema) -- part II · 739d2417

unknown authored Oct 15, 2007

The root cause of the issue was that the CREATE FUNCTION grammar,
for User Defined Functions, was using the sp_name rule.
The sp_name rule is intended for fully qualified stored procedure names,
like either ident.ident, or just ident but with a default database
implicitly selected.

A UDF does not have a fully qualified name, only a name (ident), and should
not use the sp_name grammar fragment during parsing.

The fix is to re-organize the CREATE FUNCTION grammar, to better separate:
- creating UDF (no definer, can have AGGREGATE, simple ident)
- creating Stored Functions (definer, no AGGREGATE, fully qualified name)

With the test case provided, another issue was exposed which is also fixed:
the DROP FUNCTION statement was using sp_name and also failing when no database
is implicitly selected, when droping UDF functions.
The fix is also to change the grammar so that DROP FUNCTION works with
both the ident.ident syntax (to drop a stored function), or just the ident
syntax (to drop either a UDF or a Stored Function, in the current database)


mysql-test/r/sp-error.result:
  Adjust test results
mysql-test/r/udf.result:
  Adjust test results
mysql-test/t/sp-error.test:
  Adjust test results
mysql-test/t/udf.test:
  Adjust test results
sql/sql_parse.cc:
  CREATE UDF FUNCTION does not use a fully qualified name.
sql/sql_yacc.yy:
  Fix grammar for CREATE / DROP FUNCTION, FOR udf
  Improve error messages for select no_such_function()

739d2417

15 Oct, 2007 16 commits
- fix problem caused by previous submission for bugs BUG#29589 BUG#29772 · 483bbc1f
  unknown authored Oct 15, 2007
```
sql/set_var.cc:
  fix problem caused by previous submission
```
  483bbc1f
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · e8be5c3a
  unknown authored Oct 15, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtime
```
  e8be5c3a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 3eaea539
  unknown authored Oct 15, 2007
```
into  damien-katzs-computer.local:/Users/dkatz/mysql-5.0-runtime
```
  3eaea539
- Add comments, tidy up sql_delete.cc to refer to thd->row_count_func · 7dd8a2c6
  unknown authored Oct 15, 2007
```
explicitly.


sql/sql_class.cc:
  Add comments.
sql/sql_delete.cc:
  Change syntax to make grepping easier. No semantical change.
```
  7dd8a2c6
- Fix broken compilation. · aac1523e
  unknown authored Oct 15, 2007
```
sql/net_serv.cc:
  Fix the build I broke by the previous change.
```
  aac1523e
- Remove an unused variable that was there since the first implementation · 7f8b488d
  unknown authored Oct 15, 2007
```
of the stored procedure cursors (materialized on disk).


include/mysql_com.h:
  Remove an unused variable.
sql/protocol.cc:
  net->no_send_eof was not used anywhere.
```
  7f8b488d
- Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint · 3e752c81
  unknown authored Oct 15, 2007
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint


libmysql/libmysql.c:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
```
  3e752c81
- Merge pilot.mysql.com:/data/msvensson/mysql/bug11589/my50-test_latest · 48ebefc7
  unknown authored Oct 15, 2007
```
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint


libmysql/libmysql.c:
  Auto merged
mysql-test/r/type_float.result:
  Manual merge
mysql-test/t/type_float.test:
  Manual merge
```
  48ebefc7
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c51fa634
  unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.1
```
  c51fa634
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 0cbe252b
  unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.0
```
  0cbe252b
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 219fac5c
  unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.0
```
  219fac5c
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 05b84978
  unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.1
```
  05b84978
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · c9d26db1
  unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b30885/b30885.5.0
```
  c9d26db1
- Merge mysql.com:/home/ram/work/b31154/b31154.5.0 · 314cf109
  unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b31154/b31154.5.1


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/item_sum.cc:
  Auto merged
```
  314cf109
- Merge mysql.com:/home/ram/work/mysql-5.1-maint · 360901a3
  unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b30885/b30885.5.1
```
  360901a3
- Merge mysql.com:/home/ram/work/b30885/b30885.5.0 · 0757823a
  unknown authored Oct 15, 2007
```
into  mysql.com:/home/ram/work/b30885/b30885.5.1


mysql-test/r/heap_btree.result:
  Auto merged
mysql-test/t/heap_btree.test:
  Auto merged
storage/heap/hp_hash.c:
  the code was changed to use bitmaps instead of key length, so ul
```
  0757823a
12 Oct, 2007 4 commits

Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint · 561a2802

unknown authored Oct 12, 2007

into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint


BitKeeper/deleted/.del-changelog~8457b43736642c:
  Auto merged
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
  Auto merged
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
  Auto merged
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
  Auto merged
BitKeeper/deleted/.del-README.debian~223f0edd363d08af:
  Auto merged
BitKeeper/deleted/.del-aa~f8c7e976fa99167f:
  Auto merged
BitKeeper/deleted/.del-ab~1145a71fc2a5dbb8:
  Auto merged
BitKeeper/deleted/.del-ac~66b41066a435209:
  Auto merged
BitKeeper/deleted/.del-ad~9296238d4d7d5bb3:
  Auto merged
BitKeeper/deleted/.del-ae~c54b032746985759:
  Auto merged
BitKeeper/deleted/.del-az~45092291b7eff90a:
  Auto merged
BitKeeper/deleted/.del-control~a2146883b4ed7c94:
  Auto merged
BitKeeper/deleted/.del-gomi~bcec57fe6195deee:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient10.dirs~24c90ade3a371b6f:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient10.postinst~5829f4e4a7c0206b:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient9.dirs~4420713260a0eb40:
  Auto merged
BitKeeper/deleted/.del-libmysqlclient9.postinst~80ad5f1e4633a219:
  Auto merged
BitKeeper/deleted/.del-move~6b750ba06050bc92:
  Auto merged
BitKeeper/deleted/.del-mysql-bench.dirs~3407d505223bf583:
  Auto merged
BitKeeper/deleted/.del-mysql-client.dirs~3f347d1649db13e1:
  Auto merged
BitKeeper/deleted/.del-mysql-dev.dirs~c6cacea9b3289f33:
  Auto merged
BitKeeper/deleted/.del-mysql-doc.dirs~a468f79189ff27ad:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.dirs~58d766ce6caffa2b:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postinst~36f2faba601ed8a:
  Auto merged
BitKeeper/deleted/.del-mysql-max-debug.postrm~26bdf891820d3671:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.dirs~38f36e6773ac0e79:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postinst~3406aa3bae283fe0:
  Auto merged
BitKeeper/deleted/.del-mysql-max-shared.postrm~92193bedc2b75355:
  Auto merged
BitKeeper/deleted/.del-mysql-max.dirs~be29c2b464db6050:
  Auto merged
BitKeeper/deleted/.del-mysql-max.postinst~cc8a0b3de02b23e0:
  Auto merged
BitKeeper/deleted/.del-mysql-max.postrm~66c355bd3081578b:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.dirs~7b6329c9df635ce4:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postinst~12af8ffb8a145fae:
  Auto merged
BitKeeper/deleted/.del-mysql-server-debug.postrm~ae113145ebc34ac8:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.dirs~cb56821f47811c7c:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postinst~c6fee24788b634a7:
  Auto merged
BitKeeper/deleted/.del-mysql-server-shared.postrm~f3d7f9c6bfb3ca9b:
  Auto merged
BitKeeper/deleted/.del-mysql-server.conffiles~566a6664d16909f0:
  Auto merged
BitKeeper/deleted/.del-mysql-server.dirs~b12380a091807c5e:
  Auto merged
BitKeeper/deleted/.del-mysql-server.postinst~d72bf57a84001364:
  Auto merged
BitKeeper/deleted/.del-mysql-server.postrm~68a988229b41c3bb:
  Auto merged
BitKeeper/deleted/.del-mysql-server.prerm~4445eacc70e74899:
  Auto merged
BitKeeper/deleted/.del-shlibs~3fe34471c220623c:
  Auto merged
BitKeeper/deleted/.del-ta~ec794c5d9d922b6c:
  Auto merged
BitKeeper/deleted/.del-tb~8844e8c985e40d4e:
  Auto merged

561a2802

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 848e8742
unknown authored Oct 12, 2007
```
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
```
848e8742
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · acdfb9e8
unknown authored Oct 12, 2007
```
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
```
acdfb9e8

Removing 7 year old 3.23 crufty debian dir that is not in use, so as not to cause confusion. · c76bceb0

unknown authored Oct 12, 2007


BitKeeper/deleted/.del-README.debian:
  Delete: support-files/debian/README.debian
BitKeeper/deleted/.del-changelog~8457b43736642c:
  Delete: support-files/debian/changelog
BitKeeper/deleted/.del-control:
  Delete: support-files/debian/control
BitKeeper/deleted/.del-copyright~3c3485ee25f7cde0:
  Delete: support-files/debian/copyright
BitKeeper/deleted/.del-gomi:
  Delete: support-files/debian/gomi
BitKeeper/deleted/.del-libmysqlclient10.dirs:
  Delete: support-files/debian/libmysqlclient10.dirs
BitKeeper/deleted/.del-libmysqlclient10.postinst:
  Delete: support-files/debian/libmysqlclient10.postinst
BitKeeper/deleted/.del-libmysqlclient9.dirs:
  Delete: support-files/debian/libmysqlclient9.dirs
BitKeeper/deleted/.del-libmysqlclient9.postinst:
  Delete: support-files/debian/libmysqlclient9.postinst
BitKeeper/deleted/.del-move:
  Delete: support-files/debian/move
BitKeeper/deleted/.del-my.cnf~c8cce985cf5872e3:
  Delete: support-files/debian/my.cnf
BitKeeper/deleted/.del-mysql-bench.dirs:
  Delete: support-files/debian/mysql-bench.dirs
BitKeeper/deleted/.del-aa:
  Delete: support-files/debian/patches/aa
BitKeeper/deleted/.del-mysql-client.dirs:
  Delete: support-files/debian/mysql-client.dirs
BitKeeper/deleted/.del-mysql-dev.dirs:
  Delete: support-files/debian/mysql-dev.dirs
BitKeeper/deleted/.del-mysql-doc.dirs:
  Delete: support-files/debian/mysql-doc.dirs
BitKeeper/deleted/.del-mysql-max-debug.dirs:
  Delete: support-files/debian/mysql-max-debug.dirs
BitKeeper/deleted/.del-mysql-max-debug.postinst:
  Delete: support-files/debian/mysql-max-debug.postinst
BitKeeper/deleted/.del-mysql-max-debug.postrm:
  Delete: support-files/debian/mysql-max-debug.postrm
BitKeeper/deleted/.del-mysql-max-shared.dirs:
  Delete: support-files/debian/mysql-max-shared.dirs
BitKeeper/deleted/.del-mysql-max-shared.postinst:
  Delete: support-files/debian/mysql-max-shared.postinst
BitKeeper/deleted/.del-mysql-max-shared.postrm:
  Delete: support-files/debian/mysql-max-shared.postrm
BitKeeper/deleted/.del-mysql-max.dirs:
  Delete: support-files/debian/mysql-max.dirs
BitKeeper/deleted/.del-mysql-max.postinst:
  Delete: support-files/debian/mysql-max.postinst
BitKeeper/deleted/.del-mysql-max.postrm:
  Delete: support-files/debian/mysql-max.postrm
BitKeeper/deleted/.del-mysql-server-debug.dirs:
  Delete: support-files/debian/mysql-server-debug.dirs
BitKeeper/deleted/.del-mysql-server-debug.postinst:
  Delete: support-files/debian/mysql-server-debug.postinst
BitKeeper/deleted/.del-mysql-server-debug.postrm:
  Delete: support-files/debian/mysql-server-debug.postrm
BitKeeper/deleted/.del-mysql-server-shared.dirs:
  Delete: support-files/debian/mysql-server-shared.dirs
BitKeeper/deleted/.del-mysql-server-shared.postinst:
  Delete: support-files/debian/mysql-server-shared.postinst
BitKeeper/deleted/.del-mysql-server-shared.postrm:
  Delete: support-files/debian/mysql-server-shared.postrm
BitKeeper/deleted/.del-mysql-server.conffiles:
  Delete: support-files/debian/mysql-server.conffiles
BitKeeper/deleted/.del-mysql-server.dirs:
  Delete: support-files/debian/mysql-server.dirs
BitKeeper/deleted/.del-mysql-server.postinst:
  Delete: support-files/debian/mysql-server.postinst
BitKeeper/deleted/.del-mysql-server.postrm:
  Delete: support-files/debian/mysql-server.postrm
BitKeeper/deleted/.del-mysql-server.prerm:
  Delete: support-files/debian/mysql-server.prerm
BitKeeper/deleted/.del-rules~2018e0de32c6d936:
  Delete: support-files/debian/rules
BitKeeper/deleted/.del-shlibs:
  Delete: support-files/debian/shlibs
BitKeeper/deleted/.del-ab:
  Delete: support-files/debian/patches/ab
BitKeeper/deleted/.del-ac:
  Delete: support-files/debian/patches/ac
BitKeeper/deleted/.del-ad:
  Delete: support-files/debian/patches/ad
BitKeeper/deleted/.del-ae:
  Delete: support-files/debian/patches/ae
BitKeeper/deleted/.del-az:
  Delete: support-files/debian/patches/az
BitKeeper/deleted/.del-ta:
  Delete: support-files/debian/patches/ta
BitKeeper/deleted/.del-tb:
  Delete: support-files/debian/patches/tb

c76bceb0