Commit graph

28504 commits

Author SHA1 Message Date
unknown
31ff9e9a10 A fix for Bug#13944 "libmysqlclient exporting sha1_result function":
rename sha1_* to mysql_sha1_*


include/sha1.h:
  rename sha1_* to mysql_sha1_*
mysys/sha1.c:
  rename sha1_* to mysql_sha1_*
sql/item_strfunc.cc:
  rename sha1_* to mysql_sha1_*
sql/password.c:
  rename sha1_* to mysql_sha1_*
2006-01-11 17:31:52 +03:00
unknown
aa6d8dcc74 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/usr/local/mysql/tmpbuild
2006-01-11 13:03:19 +01:00
unknown
cea02f8c0d Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-11 11:24:57 +01:00
unknown
113290fe2f Add comments that groups and describes the inits
client/mysqltest.c:
  Add comments
  Group inits logically
2006-01-11 11:10:58 +01:00
unknown
c5451d02ad Remove obsolete comment 2006-01-11 11:07:17 +01:00
unknown
b5fb52dc49 Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero.
client/mysqltest.c:
  Remove lineno_stack, instead use the already existing file_stack and add a new variable lineno to keep track of what line in the file we are at.
mysql-test/r/mysqltest.result:
  Correct test result, "At line 1" should be printed
2006-01-11 11:06:26 +01:00
unknown
7ea07618b0 Merge mysql.com:/usr/local/mysql/mysql-5.0-sol10-sparc-a-fix
into  mysql.com:/usr/local/mysql/mysql-5.0
2006-01-11 09:02:13 +01:00
unknown
bbec7eda63 Disable code for "let" to assign each column from query to it's own variable
client/mysqltest.c:
  Disable "let" assign each column of query to own var
mysql-test/r/mysqltest.result:
  Remove test results for disabled test
mysql-test/t/mysqltest.test:
  Disable test for "let assigns each column of query to own var"
2006-01-11 00:24:57 +01:00
unknown
9d2def6896 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alik/MySQL/devel/5.0-bug15110


sql/sql_parse.cc:
  Auto merged
2006-01-11 02:10:59 +03:00
unknown
d4d29edb83 Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause
There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.


BitKeeper/etc/ignore:
  added client/my_user.c libmysqld/my_user.c sql/my_user.c
client/Makefile.am:
  Use my_user.c in linking of mysqldump executable.
client/mysqldump.c:
  Fix for BUG#15110(mysqldump --triggers: does not include DEFINER clause)
include/Makefile.am:
  Add my_user.c
include/mysql_com.h:
  Introduce a constant for max user length.
libmysqld/Makefile.am:
  Add my_user.c
mysql-test/r/mysqldump.result:
  Update result file.
sql-common/Makefile.am:
  Add my_user.c
sql/Makefile.am:
  Add my_user.c
sql/sp.cc:
  Use constant for max user length.
sql/sp_head.cc:
  Use common function to parse user value.
sql/sql_acl.cc:
  Use constant for max user length.
sql/sql_parse.cc:
  Use constant for max user length.
sql/sql_show.cc:
  Use constant for max user length.
sql/sql_trigger.cc:
  Use constant for max user length.
include/my_user.h:
  A header file for parse_user().
sql-common/my_user.c:
  A new file for parse_user() implementation.
2006-01-11 02:07:40 +03:00
unknown
da73b0e137 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/nfstmp1/ingo/autopush-773/mysql-5.0
2006-01-10 21:57:47 +01:00
unknown
8e81a9fc80 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2006-01-10 20:03:28 +01:00
unknown
fb0fcab3e5 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into  hasky.mysql.fi:/home/jani/mysql-5.0
2006-01-10 20:56:24 +02:00
unknown
ffc206d9be Post-merge changes
mysql-test/t/disabled.def:
  Enabling type_time.test
2006-01-10 21:03:02 +03:00
unknown
26e7bf4aee Changed function prototype. 2006-01-10 19:19:56 +02:00
unknown
af024409af Re-run fix-fields on condition if table was reopened in HANDLERREAD
sql/sql_base.cc:
  Added more comments
sql/sql_handler.cc:
  Re-run fix-fields on condition if table was reopened
2006-01-10 19:13:12 +02:00
unknown
55499cad0d Fixed refresh_status function.
sql/sql_class.cc:
  Improved documentation on add_to_status().
sql/sql_parse.cc:
  Changed refresh status to take thd as argument to avoid current_thd.
  Removed add_to_status away from loop, as it is not necessary for each
  variable, only required for each thread. In this case only the current
  thread.
2006-01-10 18:56:23 +02:00
unknown
a44c687b49 Merge mysql.com:/home/alexi/dev/mysql-4.1-15805
into  mysql.com:/home/alexi/dev/mysql-5.0-15805


mysql-test/r/type_time.result:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2006-01-10 19:22:47 +03:00
unknown
159eaf4f0a Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1


sql/sql_select.cc:
  Auto merged
2006-01-10 18:03:54 +02:00
unknown
29818203eb Commenting out testcases which cause type_time.test failure.
To be uncommented after fixing bug 15805.


mysql-test/r/type_time.result:
  Fixing testcases results.
mysql-test/t/type_time.test:
  Temporaly commented out testcases which cause type_time.test failure.
   To be uncommented after fixing bug 15805.
2006-01-10 17:57:46 +03:00
unknown
8c258f26df Merge mysql.com:/home/mydev/mysql-4.1-bug5390
into  mysql.com:/home/mydev/mysql-5.0-bug5390
2006-01-10 15:56:47 +01:00
unknown
935ad7e8f3 Fix for crashing mysqltest
client/mysqltest.c:
  Allocate one extra byte for string terminator in varname
2006-01-10 15:56:30 +01:00
unknown
2fe75c389b Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
2006-01-10 14:40:05 +02:00
unknown
b49b86aed3 BUG#9483 test was overworked to account reviews finally to leave only REVOKE check.
There is a specific rpl_ignore_grant test case for GRANT.


mysql-test/r/rpl_ignore_revoke.result:
  New BitKeeper file ``mysql-test/r/rpl_ignore_revoke.result''
mysql-test/t/rpl_ignore_revoke-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke-slave.opt''
mysql-test/t/rpl_ignore_revoke.test:
  New BitKeeper file ``mysql-test/t/rpl_ignore_revoke.test''
2006-01-10 13:44:08 +02:00
unknown
cdf2eb4bcd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
2006-01-10 09:57:59 +01:00
unknown
09ddf79d33 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-09 21:46:33 -08:00
unknown
8fd14af83a Ajustement after merge 2006-01-09 21:44:42 -08:00
unknown
7341c73748 Merge rurik.mysql.com:/home/igor/mysql-4.1
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2006-01-09 15:20:01 -08:00
unknown
c9c75cd1be Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/mysqltest.test:
  Changed to "test ! -e" instead of "test -s"
2006-01-09 20:12:18 +01:00
unknown
352d943bb6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
2006-01-09 18:06:16 +01:00
unknown
ce221a703c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2006-01-09 18:52:22 +02:00
unknown
4ae3456ba4 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598


sql/sql_acl.cc:
  Auto merged
2006-01-09 17:18:49 +01:00
unknown
9cfcc32521 Bug Server crashes in specific case during setting new password
- Comparing host string against NULL caused crash. 
- If host.hostname is NULL treat it as ""


mysql-test/r/grant.result:
  Update test results
mysql-test/t/grant.test:
  Add test for user with host ""
2006-01-09 17:12:26 +01:00
unknown
48d7d98e7d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/yassl_link_problem/my50-yassl_link_problem
2006-01-09 15:31:38 +01:00
unknown
0b5e8a801c Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1
into  devsrv-b.mysql.com:/space/magnus/my41-bug15598
2006-01-09 15:29:25 +01:00
unknown
9d9375fa2c Merge mysql.com:/home/mydev/mysql-4.1
into  mysql.com:/home/mydev/mysql-4.1-bug5390
2006-01-09 12:56:09 +01:00
unknown
efa342d886 Merge mysql.com:/home/mydev/mysql-4.0-bug5390
into  mysql.com:/home/mydev/mysql-4.1-bug5390
2006-01-09 12:54:24 +01:00
unknown
998b7dca54 Merge neptunus.(none):/home/msvensson/mysql/bug15598/my41-bug15598
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598


mysql-test/t/grant.test:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/r/grant.result:
  SCCS merged
2006-01-09 11:16:29 +01:00
unknown
da800fe5a4 Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598
into  devsrv-b.mysql.com:/space/magnus/my41-bug15598


sql/sql_acl.cc:
  Auto merged
2006-01-09 10:57:28 +01:00
unknown
16257e8b35 Bug Server crashes in specific case during setting new password
- When acl_user->host.hostname is NULL compare it as ""


mysql-test/r/grant.result:
  Test user with host ''
mysql-test/t/grant.test:
  Test user with host ''
sql/sql_acl.cc:
  If acl_user->host.hostname is NULL compare it as ""
2006-01-09 10:31:07 +01:00
unknown
e12bc697db After merge fix (Lines lost in manual merge) 2006-01-09 11:10:49 +02:00
unknown
fca6cf46d3 Add yassl libs to libmysqlclient_r as well.
Add a symlink to extra/yassl/include/openssl to inlude/ when compiling with yassl
Similiar to readline)


config/ac-macros/yassl.m4:
  Symlink extra/yassl/include/openssl dir to include/
include/Makefile.am:
  Call yassl_h_ln_cmd when linking sources, this will create symlink to openssl in include when compiling with yassl
libmysql_r/Makefile.am:
  Inlude yassl libs into libmysqlclient_r(just as we do in libmysqlclient)
2006-01-09 10:01:07 +01:00
unknown
40a1023a4f Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-01-08 19:16:36 -08:00
unknown
51525a9b82 ndb - wl#2972 ndb api test_event_merge 5.0+5.1
ndb/test/ndbapi/test_event_merge.cpp:
  5.0 passes. 5.1 has many problems
2006-01-09 01:09:42 +01:00
unknown
13c27a9704 Merge mysql.com:/home/my/mysql-4.0
into  mysql.com:/home/my/mysql-4.1


client/mysqlimport.c:
  Auto merged
myisam/myisam_ftdump.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/item_cmpfunc.cc:
  merge (keep old code)
sql/sql_handler.cc:
  manual merge
2006-01-08 19:07:49 +02:00
unknown
48c8241853 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/t/having.test:
  Auto merged
mysql-test/r/having.result:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
2006-01-07 23:10:08 -08:00
unknown
770e0e8118 Fixed bug : a query with a having clause containing only set function returned a wrong result set.
mysql-test/r/having.result:
  Added a test case for bug .
mysql-test/t/having.test:
  Added a test case for bug .
sql/sql_select.cc:
  Fixed bug : a query with a having clause containing only set function returned a wrong result set.
  It happened because processing of the set functions in having started with a call of the split_sum_func
  method, instead of the split_sum_func2 method.
2006-01-07 23:00:06 -08:00
unknown
e6dff42367 BUG#16282: Remove unused gcc.cpp linker input that causes failure in make -j.
BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Delete: ndb/src/common/portlib/gcc.cpp
2006-01-08 07:42:40 +01:00
unknown
312c2f4759 Fixed bug : MIN/MAX optimization was not applied to views.
mysql-test/r/view.result:
  Added a test case for bug .
mysql-test/t/view.test:
  Added a test case for bug .
sql/opt_sum.cc:
  Fixed bug : MIN/MAX optimization was not applied to views.
  The fix employs the standard way of handling direct references to view fields.
2006-01-06 22:28:26 -08:00
unknown
2dcedd9cbc Fixes during review of new pushed code:
Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
Safety fix for bug  "select distinct with group by caused server crash"


client/mysqlimport.c:
  Remove not used variable
myisam/myisam_ftdump.c:
  Fixed compiler warning
sql/item_cmpfunc.cc:
  Removed compiler warning
sql/sql_handler.cc:
  Remove wrong fix for Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash.
  It's better to let mysql_lock_tables reopen the TABLE object in case of OPTIMIZE TABLE and fix items AFTER mysql_lock_table() instead of before
sql/sql_select.cc:
  Safety fix for bug  "select distinct with group by caused server crash"
  The previous patch only removed the symptomps, this fix removed the cause of the problem
  (Which was that not all hidden_fields was stored in the temporary table)
2006-01-06 21:42:17 +02:00