sergefp@mysql.com
06f12f66e8
Post-merge fixes
2007-09-12 01:52:27 +04:00
sergefp@mysql.com
6f702a4b42
Post-merge fixes
2007-09-11 02:41:42 +04:00
sergefp@pylon.mylan
d276ce3402
Merge mysql.com:/home/psergey/mysql-4.1-bug30385
...
into mysql.com:/home/psergey/mysql-5.0-bug30385
2007-09-11 02:24:08 +04:00
sergefp@mysql.com
da04109de2
BUG#30385: Server crash when deleting with ORDER BY and LIMIT
...
in get_index_for_order(), don't walk over the end of the index key parts
when matching index description and needed ordering.
2007-09-10 16:26:51 +04:00
gshchepa/uchum@gleb.loc
d330a49105
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-09-06 22:27:13 +05:00
mhansson@dl145s.mysql.com
b1cc84ec1d
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into dl145s.mysql.com:/data0/mhansson/my50-bug30234-push
2007-09-03 12:44:17 +02:00
mhansson/martin@linux-st28.site
df5c9e69f0
Bug #30234 : Unexpected behavior using DELETE with AS and USING
...
DELETE FROM ... USING ... statements with the following type of
ambiguous aliasing gave unexpected results:
DELETE FROM t1 AS alias USING t1, t2 AS alias WHERE t1.a = alias.a;
This query would leave table t1 intact but delete rows from t2.
Fixed by changing DELETE FROM ... USING syntax so that only alias
references (as opposed to alias declarations) may be used in FROM.
2007-09-03 11:55:35 +02:00
gluh@mysql.com/eagle.(none)
33eaf2cd95
Bug#29408 Cannot find view in columns table if the selection contains a function
...
Use view db name as thread default database, in order to ensure
that the view is parsed and prepared correctly.
2007-09-03 12:22:56 +05:00
gshchepa/uchum@gleb.loc
df7771de65
Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30126
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-31 17:05:37 +05:00
gshchepa/uchum@gleb.loc
3e49bbd8e7
Fixed bug #30126 .
...
When dumping database from a 4.x server, the mysqldump client
inserted a delimiter sign inside special commentaries of the form:
/*!... CREATE DATABASE IF NOT EXISTS ... ;*/
During restoration that dump file was splitten by delimiter signs on
the client side, and the rest of some commentary strings was prepended
to following statements.
The 4x_server_emul test case option has been added for use with the
DBUG_EXECUTE_IF debugging macro. This option affects debug server
builds only to emulate particular behavior of a 4.x server for
the mysqldump client testing. Non-debugging builds are not affected.
2007-08-31 16:59:07 +05:00
msvensson@pilot.(none)
b1fdece307
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 17:54:16 +02:00
msvensson@pilot.(none)
ac5309cb04
Remove any old pidfile before starting mysqld to make sure that
...
'mysqld_wait_started' don't return prematurely because of an old
pidfile
2007-08-29 17:54:02 +02:00
msvensson@pilot.(none)
1a1bbf2da0
Remove unportable use of "system rm"
2007-08-29 14:44:23 +02:00
msvensson@pilot.(none)
2028c2b696
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 14:39:59 +02:00
msvensson@pilot.(none)
f164a136e1
Fix typo: '$$' => '$'
2007-08-29 14:39:40 +02:00
msvensson@pilot.(none)
aa57f6106c
Remove unportable use of "system rm"
2007-08-29 12:47:00 +02:00
msvensson@pilot.(none)
9ffb05dbbf
Remove unportable "system rm"
2007-08-29 12:44:43 +02:00
msvensson@pilot.(none)
044f7a3270
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 11:54:21 +02:00
msvensson@pilot.(none)
523cddeec3
Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-29 11:53:36 +02:00
msvensson@pilot.(none)
b68689172f
Remove unportable use of "exec chmod"
2007-08-29 11:53:15 +02:00
msvensson@pilot.(none)
387990f78d
Add 'mtr_rmtree'
2007-08-29 11:51:34 +02:00
gkodinov/kgeorge@magare.gmz
625c44fe67
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/autopush/B30377-5.0-opt
2007-08-29 12:47:24 +03:00
mhansson/martin@linux-st28.site
f672e5bca6
Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into linux-st28.site:/home/martin/mysql/src/bugx/my50-bugx
2007-08-29 10:49:19 +02:00
tsmith@ramayana.hindu.god
044cd7b471
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/b27694/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-28 13:24:31 -06:00
gkodinov/kgeorge@magare.gmz
cfaa0983c8
Bug #30377 : EXPLAIN loses last_query_cost when used with UNION
...
Currently the Last_query_cost session status variable shows
only the cost of a single flat subselect. For complex queries
(with subselects or unions etc) Last_query_cost is not valid
as it was showing the cost for the last optimized subselect.
Fixed by reseting to zero Last_query_cost when the complete
cost of the query cannot be determined.
Last_query_cost will be non-zero only for single flat queries.
2007-08-28 18:51:03 +03:00
msvensson@pilot.(none)
4a7087526f
Streamline "do_close_connection" and "do_send_quit"
...
Fix typo, "next_con" -> "con"
2007-08-28 16:47:05 +02:00
msvensson@pilot.(none)
397fbd0289
Remove unportable constructs in loaddata.test
2007-08-28 16:44:31 +02:00
msvensson@pilot.(none)
4a013e295d
Move "analyze_testcase_failure" to mysqltest(since it knows best when
...
to perform this analyzis)
2007-08-28 15:32:13 +02:00
msvensson@pilot.(none)
bce8ea54ff
Merge pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-28 11:35:22 +02:00
msvensson@pilot.(none)
c2b817013c
Merge pilot.(none):/data/msvensson/mysql/yassl_import/my50-yassl_import
...
into pilot.(none):/data/msvensson/mysql/bug28812/my50-bug28812
2007-08-28 11:35:05 +02:00
msvensson@pilot.(none)
ec421a02a9
Bug#28812 rpl_ssl fails due to assert in extra/yassl/src/socket_wrapper.cpp:117
...
- Merge sslaccept and sslconnect.
- Atomically "reset" vio to VIO_TYPE_SSL when the SSL connection has
succeeded, this avoids having to revert anything and thus protects
against "close_active_vio" in the middle.
- Add some variance to the testcase
2007-08-28 11:34:43 +02:00
msvensson@pilot.(none)
394d9a0e55
Import yaSSL version 1.7.2
...
- Fix bug#27265
- Support for fixing bug#18441
2007-08-28 10:35:55 +02:00
tsmith@ramayana.hindu.god
86ef148e6c
Merge ramayana.hindu.god:/home/tsmith/m/bk/50
...
into ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-27 18:19:55 -06:00
mhansson/martin@linux-st28.site
a4d5d9204d
Bug #30596 GROUP BY optimization gives wrong result order
...
The optimization that uses a unique index to remove GROUP BY, did not
ensure that the index was actually used, thus violating the ORDER BY
that is impled by GROUP BY.
Fixed by replacing GROUP BY with ORDER BY if the GROUP BY clause contains
a unique index. In case GROUP BY ... ORDER BY null is used, GROUP BY is
simply removed.
2007-08-27 17:33:41 +02:00
df@pippilotta.erinye.com
0670af9479
adjust version number
2007-08-27 11:38:32 +02:00
msvensson@pilot.(none)
f9c245611e
Bug#29805 mysql_upgrade test fail if ~/.my.cnf contain a password
...
- "mysql" and "mysqlcheck" should not read defaults file
2007-08-27 11:31:49 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
ba419bdc8c
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
2007-08-27 11:24:54 +02:00
msvensson@pilot.(none)
a91bd85215
Bug#28560 mysql_upgrade test links /usr/local/mysql/lib libraries
...
- Chop off .libs/ part of path if running in non installed builddir
using libtool
2007-08-27 10:25:34 +02:00
gshchepa/uchum@gleb.loc
a8c7e45067
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-26 19:47:23 +05:00
gshchepa/uchum@gleb.loc
01190c869c
Merge gleb.loc:/home/uchum/work/bk/5.0
...
into gleb.loc:/home/uchum/work/bk/5.0-opt
2007-08-25 23:25:37 +05:00
evgen@moonbone.local
36a2950016
sql_select.cc:
...
Additional fix for the bug#30245.
2007-08-25 17:32:17 +00:00
jani@a88-113-38-195.elisa-laajakaista.fi
516cafdc79
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
2007-08-25 11:39:56 +03:00
evgen@moonbone.local
2ee3efc240
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/mnt/gentoo64/work/30245-bug-5.0-opt-mysql
2007-08-24 22:11:23 +00:00
joerg@trift2.
d7c1a81136
Merge trift2.:/MySQL/M50/netware2-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-08-24 23:40:36 +02:00
joerg@trift2.
2fd45aaee6
Fixes for the NetWare builds, discovered during 5.1.21-beta and backported to 5.0:
...
1) Ensure "init_db.sql" and "test_db-sql" really get built.
2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.
2007-08-24 23:07:59 +02:00
msvensson@pilot.(none)
89780a84c8
Remove unsued variable $glob_hostname, unused functions
...
'mtr_short_hostname' and 'mtr_full_hostname'
2007-08-24 15:43:45 +02:00
dfischer/mysqldev@production.mysql.com
81528c1a00
Merge bk-internal:/home/bk/mysql-5.0-build
...
into mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
2007-08-24 13:47:11 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
b356018839
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-main
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-marvel
2007-08-24 14:43:33 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
74afbb4b7b
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/mysqldev/my/build-200708231546-5.0.48/mysql-5.0-release
2007-08-24 13:30:16 +02:00
msvensson@pilot.(none)
643ce3979f
Merge pilot.(none):/data/msvensson/mysql/bug30593/my50-bug30593
...
into pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
2007-08-24 13:11:14 +02:00