Commit graph

47308 commits

Author SHA1 Message Date
kostja@bodhi.(none)
d97db648a0 Fix some mysqltest warnings. 2007-06-01 17:49:01 +04:00
msvensson@pilot.(none)
7c15ac32b0 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-01 15:43:47 +02:00
msvensson@pilot.(none)
583a126660 Merge pilot.(none):/data/msvensson/mysql/bug28373/my50-bug28373
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-01 15:43:04 +02:00
msvensson@pilot.(none)
a715a5d7be Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-01 15:19:16 +02:00
msvensson@pilot.(none)
332302ed18 Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-01 15:18:46 +02:00
msvensson@pilot.(none)
146e087186 Merge bk-internal:/home/bk/mysql-5.0-maint
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-01 14:53:58 +02:00
msvensson@pilot.(none)
721d25f8ab Merge pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-01 14:49:21 +02:00
msvensson@pilot.(none)
8ed65b97e1 Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-06-01 14:35:47 +02:00
msvensson@pilot.(none)
92675afc77 Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_value
into  pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
2007-06-01 14:35:30 +02:00
msvensson@pilot.(none)
f6b5eb54b5 Merge pilot.(none):/data/msvensson/mysql/my51-m-bug24168
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-01 14:34:26 +02:00
msvensson@pilot.(none)
cc45f1b79a Bug #24168 mysql-test-run not functioning in autotest (cannot use external cluster)
- Removed the global variable(s) glob_use_running_cluster/slave
   and put a property on each "cluster" called "use_running" which
   is set to 1 if user passed either ndb_connectstring or 
   ndb_connectstring_slave. Thus mtr.pl should not start/stop the
   cluster.
2007-06-01 14:32:26 +02:00
msvensson@pilot.(none)
aede6302af Fiux syntax errors in grant.test, connect command with both -- and ;
only one of those is allowed
2007-06-01 14:12:16 +02:00
msvensson@pilot.(none)
1b6d413a2f Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
into  pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497
2007-06-01 13:50:59 +02:00
msvensson@pilot.(none)
fd1c544384 Add missing semicolon after connect command 2007-06-01 13:39:54 +02:00
joerg@debian.(none)
81930fc4bf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
into  debian.(none):/M51/merge-5.1
2007-06-01 12:59:06 +02:00
gkodinov/kgeorge@magare.gmz
72a64f083b Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  magare.gmz:/home/kgeorge/mysql/autopush/B28366-5.0-opt-win
2007-06-01 13:43:17 +03:00
msvensson@pilot.(none)
62f71f5d7a Merge pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
into  pilot.(none):/data/msvensson/mysql/bug28497/my51-bug28497
2007-06-01 12:38:54 +02:00
msvensson@pilot.(none)
91170035d9 Turn query_logging back on to avoid sideeffects in folloing test section 2007-06-01 12:38:41 +02:00
kostja@bodhi.(none)
d0ff5df029 Fix a warning. 2007-06-01 14:17:23 +04:00
msvensson@pilot.(none)
d43153f274 Merge pilot.(none):/data/msvensson/mysql/bug28497/my41-bug28497-query_get_value
into  pilot.(none):/data/msvensson/mysql/bug28497/my50-bug28497
2007-06-01 12:04:05 +02:00
msvensson@pilot.(none)
09c5c03cb2 Bug#28497 wait_for_slave_to_stop can cause random replication mysql-test failures
- Add funtion "query_get_value to allow reading a fields value
   into a $variable
2007-06-01 12:01:42 +02:00
kostja@bodhi.(none)
679a264357 A post-merge fix. 2007-06-01 13:33:57 +04:00
kostja@bodhi.(none)
16633169e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-06-01 12:12:06 +04:00
igor@olga.mysql.com
a24a38df75 Post-merge fix. 2007-05-31 23:31:59 -07:00
ibabaev@bk-internal.mysql.com
d460dc700a Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
2007-06-01 06:33:37 +02:00
gshchepa/uchum@gleb.loc
3cb5a0202f Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
2007-06-01 03:05:25 +05:00
gshchepa/uchum@gleb.loc
5d15377d2d Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
2007-06-01 02:51:35 +05:00
gshchepa/uchum@gleb.loc
92737068ea Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-27827-fresh
into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
2007-06-01 02:40:49 +05:00
gshchepa/uchum@gleb.loc
d6a0bbf241 sql_view.cc:
Additional patch for bug #28244 to workaround valgrind warnings.
2007-06-01 02:25:11 +05:00
evgen@moonbone.local
df3b70821b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  moonbone.local:/mnt/gentoo64/work/28494-bug-5.0-opt-mysql
2007-06-01 01:18:45 +04:00
evgen@moonbone.local
f70ae3a6de Bug#28494: Grouping by Item_func_set_user_var produces incorrect result.
The end_update() function uses the Item::save_org_in_field() function to
save original values of items into the group buffer. But for the 
Item_func_set_user_var this method was mapped to the save_in_field method.
The latter function wrongly decides to use the result_field. This leads to
saving incorrect value in the grouping buffer and wrong result of the whole
query.

The can_use_result_field argument of the bool type is added to the
Item_func_set_user_var::save_in_field() function. If it is set to FALSE
then the item's result field won't be used. Otherwise it will be detected
whether the result field will be used (old behaviour).
Two wrapping functions for the function above are added to the 
Item_func_set_user_var class:
the save_in_field(Field *field, bool no_conversions) - it calls the above
function with the can_use_result_field set to TRUE.
the save_org_in_field(Field *field) - same, but the can_use_result_field
is set to FALSE.
2007-06-01 01:17:14 +04:00
gshchepa/uchum@gleb.loc
cab4ca9c33 Fixed bug #27827.
ON conditions from JOIN expression were ignored at CHECK OPTION
check when updating a multi-table view with CHECK OPTION.

The st_table_list::prep_check_option function has been
modified to to take into account ON conditions at CHECK OPTION check
It was also changed to build the check option condition only once
for any update used in PS/SP.
2007-06-01 02:15:40 +05:00
gshchepa/uchum@gleb.loc
0951a09995 Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
into  gleb.loc:/home/uchum/work/bk/mysql-5.1-opt
2007-05-31 21:11:01 +05:00
gshchepa/uchum@gleb.loc
78a5f9e6b9 sql_select.cc:
Patch to eliminate compilation error.
2007-05-31 20:32:18 +05:00
jani@a88-113-38-195.elisa-laajakaista.fi
2c8f4f9791 Added casts to avoid compiler warnings and fixed a wrong type.
---
Added casts and fixed wrong type.
---
Added casts and fixed wrong type.
---
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
---
Don't give warning that readonly variable is forced to be readonly
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
---
Disabled compiler warnings mainly for Win 64.
---
Added casts to remove compiler warnings on windows
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into  mysql.com:/home/my/mysql-5.1
---
Added escapes for double quotes and parenthesis.
---
Archive db fix plus added non-critical warnings
in ignore list.
---
Fixed previously added patch and added new ignored warning.
2007-05-31 17:45:22 +03:00
gshchepa/uchum@gleb.loc
55833d3a9d Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28244
2007-05-31 19:07:10 +05:00
gshchepa/uchum@gleb.loc
f690d759a0 sql_view.cc:
Patch to eliminate compilation warning.
2007-05-31 19:06:30 +05:00
msvensson@pilot.(none)
42deaca611 Bug#28373 mysqltest test case fails with binlog disabled
- Update tests to be independent how the mysqld was started
2007-05-31 15:58:22 +02:00
gshchepa/uchum@gleb.loc
362449418c Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
2007-05-31 18:19:38 +05:00
gshchepa/uchum@gleb.loc
19d513ded7 Merge gleb.loc:/home/uchum/work/bk/mysql-5.0-opt
into  gleb.loc:/home/uchum/work/bk/mysql-5.0-opt-28244
2007-05-31 18:16:29 +05:00
gshchepa/uchum@gleb.loc
12d43d55b4 Fixed bug #28244.
When the same VIEW was created at the master side twice,
malformed (truncated after the word 'AS') query string 
was forwarded to client side, so error messages on the
master and client was different, and replication was
broken.

The mysql_register_view function call failed
too early: fields of `view' output argument of this 
function was not filled yet with correct data required
for query replication.
The mysql_register_view function also copied pointers to 
local buffers into a memory allocated by the caller.
2007-05-31 17:30:56 +05:00
mhansson@dl145s.mysql.com
93cd86fc75 Merge dl145s.mysql.com:/users/mhansson/mysql/push/bug27741/my50-bug27741
into  dl145s.mysql.com:/users/mhansson/mysql/push/bug27741/my51-bug27741
2007-05-31 14:27:02 +02:00
mhansson@dl145s.mysql.com
3ee1651861 bug#27741: udf test fails on AIX < 5.3
problem #1: udf_example.so does not get built on AIX

solution#1: build it yourself using
cd sql; gcc  -g -I ../include/ -I /usr/include/ -lpthread  \
-shared -o udf_example.so udf_example.c; mv udf_example.so \
.libs/ 

problem#2 (the bug): udf_example fails because it does not
recognize the variable LD_LIBRARY_PATH when doing dl_open(),
it looks at LIBPATH

solution#2: add the library path to LIBPATH

problem#3: udf_example returns the wrong result length since 
it relies on strmov to return a pointer to the end of the 
string that it copies. On AIX builds, where m_string.h is not
included (m_string defines a macro expanding strmov to stpcpy),
there is a macro expanding strmov to strcpy, which returns a 
pointer to the first character.

solution#3: define strmov as stpcpy.

problem#4: #2 applies on hp-ux as well, but this platform
looks at SHLIB_PATH

solution#4: added the library path to SHLIB_PATH
2007-05-31 14:22:21 +02:00
df@pippilotta.erinye.com
509faa5a3b Fix CMakeLists.txt. 2007-05-31 14:11:58 +02:00
df@pippilotta.erinye.com
9870db8345 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-05-31 14:10:41 +02:00
df@pippilotta.erinye.com
11c8345166 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-05-31 14:09:04 +02:00
kaa@polly.local
ca25403ca1 Merge polly.local:/home/kaa/src/maint/bug27643/my51-bug27643
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-05-31 16:07:17 +04:00
df@pippilotta.erinye.com
7f203056db Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-05-31 14:06:31 +02:00
df@pippilotta.erinye.com
20661e63b0 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
2007-05-31 14:06:19 +02:00
df@pippilotta.erinye.com
6e7585a011 fix test case 2007-05-31 14:05:07 +02:00