Commit graph

58544 commits

Author SHA1 Message Date
Evgeny Potemkin
c4cf9fc0bb #41760 Inserting into multiple-table views is not working
During insert, we are not reading the rows in a referring table but
instead using the last read row that happens to be in table->record[0].

Now INSERT into such view is denied.
2009-10-20 11:30:41 +04:00
Vladislav Vaintroub
68c55462ef Bug #48047 Can't do normal shutdown
Fix a regression that crept in when downporting Windows improvements.
Instead of a shutdown thread, another thread that  handledsocket connection was created.
2009-10-15 05:18:52 +02:00
Jonathan Perkin
e06a64c064 Merge to mysql-next-mr-bugfixing 2009-10-14 12:19:49 +01:00
Jonathan Perkin
4ea46eae87 Merge to mysql-trunk-bugfixing 2009-10-14 12:16:58 +01:00
Jonathan Perkin
e745ae7927 bug#45810: DTrace: build fails when 'dtrace' is not in PATH
Ensure full path to dtrace binary is used, fixes builds where
/usr/sbin is not in $PATH.
2009-10-14 12:15:46 +01:00
Gleb Shchepa
bc7c439e6b Backport of fix to bug #33629 into mysql-next-mr-bugfixing.
Bug #33629: last_day function can return null, but has 'not null' flag set for result

LAST_DAY and MAKEDATE functions are documented as
returning NULL value, but actually they was implemented
as returning NOT NULL typed values.

That caused a confusing error "ERROR 1048 (23000): Column
'...' cannot be null" on queries like: 

  SELECT 1 FROM (SELECT LAST_DAY('0')) a;
2009-10-13 21:50:08 +05:00
Sergei Golubchik
9824a0ca27 updated test results in funcs_1 2009-10-12 23:34:52 +02:00
Sergei Golubchik
df59e27b4e bug#33731 - INSTALL/UNINSTALL PLUGIN: Inconsistent handling of identifier case
indexed column in mysql.plugin table should use case-insensitive collation
for index lookups to work

(backport from 6.0)
2009-10-12 20:15:10 +02:00
Alexander Nozdrin
8cf706218a Merge from mysql-next-mr. 2009-10-09 20:03:34 +04:00
Alexander Nozdrin
b16e88b292 Merge from mysql-trunk. 2009-10-09 20:03:03 +04:00
Alexander Nozdrin
84f90701d9 Merge from mysql-trunk. 2009-10-09 19:56:30 +04:00
Alexander Nozdrin
3dcbeb36b4 Update version in default.conf. 2009-10-09 19:54:56 +04:00
Alexander Nozdrin
a9f2b3484a Backporting of Bug#40128 from 6.0 to next-mr.
Original revision in 6.0:
------------------------------------------------------------
revno: 2599.108.1
committer: Alexander Nozdrin <alik@sun.com>
branch nick: 6.0-rpl-bug40128
timestamp: Wed 2009-01-21 15:33:42 +0300
message:
  Fix for Bug#40128: drop-no_root fails under windows in 6.0-rpl.
  
  The problem was that directories with no permission (000) files
  are deleted differently on UNIX and on Windows.
  
  On UNIX, 000-permission file is deleted perfectly, but other files
  are left in the directory.
  
  On Windows, 000-permission file is not deleted, but other files
  are deleted.
  
  Also, the fix needed a change in mysqltest.c: 'chmod' directive
  should return a positive error code (in order to be handled).
  It's decided to return a constant '1' for all error codes
  just to be OS-independent.
------------------------------------------------------------
2009-10-09 18:52:49 +04:00
Alexander Nozdrin
9c5e216afa Fix events_bugs test after backporting a patch for Bug#35297. 2009-10-09 18:22:35 +04:00
Alexander Nozdrin
0845f51f4f Pull from mysql-next-mr. 2009-10-09 13:50:49 +04:00
Alexander Nozdrin
8a14764cfc Pull from mysql-next-mr. 2009-10-09 13:27:24 +04:00
Alexander Nozdrin
51eff4b320 Pull from mysql-trunk. 2009-10-09 13:26:26 +04:00
Alexander Nozdrin
5afc219d01 Merge from mysql-trunk. 2009-10-09 13:23:23 +04:00
Alexander Nozdrin
f1c6580b49 Change the version tag (to 5.5.0). 2009-10-09 13:22:26 +04:00
Alexander Nozdrin
256a3b3795 Merge from mysql-next-mr. 2009-10-09 13:00:36 +04:00
Alexander Nozdrin
56d12419a2 Merge from mysql-trunk. 2009-10-09 12:59:48 +04:00
Alexander Nozdrin
952b6f5360 Merge from mysql-trunk. 2009-10-09 12:56:39 +04:00
Alexander Nozdrin
0ca1292d3b Fix default.cof. 2009-10-09 12:48:08 +04:00
Alexander Nozdrin
4e3fbcd156 Merge from mysql-trunk-bugfixing. 2009-10-09 12:30:34 +04:00
Alexander Nozdrin
3f76ffd433 Mark main.log_tables experimental (Bug 47924). 2009-10-08 23:13:33 +04:00
Alexander Nozdrin
a2dfafd4d7 Merge from mysql-trunk-bugfixing. 2009-10-08 13:29:48 +04:00
Alexander Nozdrin
633625e8fc Fix index_merge_innodb.result (Bug 45727). 2009-10-08 13:27:45 +04:00
Alexander Nozdrin
f4d27e81bb Merge from mysql-next-mr. 2009-10-08 11:42:38 +04:00
Alexander Nozdrin
83177656d9 A backport of a patch for Bug#35297.
Original revision in mysql-6.0-codebase is:

revno: 2617.31.14
committer: Konstantin Osipov <kostja@sun.com>
branch nick: mysql-6.0-runtime
timestamp: Sat 2009-03-28 11:42:55 +0300
message:
  Bug#35297 SHOW CREATE EVENT does not show the DEFINER:
  update test result after a merge from now.
2009-10-08 00:57:03 +04:00
Alexander Nozdrin
4db0f8b832 A backport a patch of Bug#34828.
Original revision is from mysql-6.0-codebase:

revno: 2617.23.13
committer: Alexander Nozdrin <alik@sun.com>
branch nick: 6.0-rt-bug34828
timestamp: Tue 2009-02-24 14:25:46 +0300
message:
  A patch for Bug#34828: OF is taken as OFF and a value of 0
  is set for variable SQL_notes.
  
  The problem was that partial match was allowed for keywords.
  
  A fix is to disable partial match and require full match.
2009-10-07 20:49:26 +04:00
Alexander Nozdrin
104efe86ab A backport of patch for Bug#26704.
Original revision is from mysql-6.0-codebase:

revno: 2630.3.1
committer: Alexander Nozdrin <alik@mysql.com>
branch nick: 6.0-rt-bug26704
timestamp: Thu 2008-05-29 21:04:06 +0400
message:
  A fix for Bug#26704: Failing DROP DATABASE brings
  mysql-client out of sync.

  The problem was that we changed current database w/o caring
  whether it was dropped successfully or not.

  The fix is not to change current database if we failed to drop it.
2009-10-07 20:39:57 +04:00
Alexander Nozdrin
d8a8170863 Merge from mysql-trunk-bugfixing. 2009-10-07 19:42:50 +04:00
Alexander Nozdrin
019f5121ad Disabled index_merge2.inc due to Bug 45727. 2009-10-07 19:37:36 +04:00
Guilhem Bichot
528ab7bb11 Backport of the fix for BUG#33730 "Full table scan instead selected partitions for query more than 10 partitions"
from 6.0, made in sergefp@mysql.com-20090205190644-q8632sniogedhtsu
2009-10-05 22:59:19 +02:00
Guilhem Bichot
843b73b34b Port of fix for BUG#42893 "main.information_schema times out sporadically"
(from revision konstantin@mysql.com-20080627154042-923m6lzk7z77lrgj ). This moves the slow part
(10 seconds over 13) into a separate big test.
2009-10-05 16:22:48 +02:00
Alexander Nozdrin
4863e5ceb8 Merge from mysql-next-mr. 2009-10-04 00:04:53 +04:00
Alexander Nozdrin
9aeb382731 Fix default.conf. 2009-10-03 23:59:28 +04:00
Alexander Nozdrin
651390e818 Fix default.conf. 2009-10-03 23:47:25 +04:00
Alexander Nozdrin
2758bb8aa8 Merge from mysql-trunk-bugfixing. 2009-10-02 16:50:18 +04:00
Alexander Nozdrin
073c5a932d Made two test cases experimental. 2009-10-02 16:48:51 +04:00
Alexander Nozdrin
8e0204fb58 Merge from mysq-next-mr-wtf. 2009-10-02 16:14:59 +04:00
Alexander Nozdrin
03d124c036 Merge from mysql-next-mr. 2009-10-02 16:02:56 +04:00
Alexander Nozdrin
dbab87af6a Merge from mysql-trunk-bugfixing. 2009-10-01 15:32:45 +04:00
Alexander Nozdrin
83566cd4f1 1. Respect experimental tag in gcov mode;
2. Mark ndb, rpl_ndb test suites experimental.
2009-10-01 15:31:54 +04:00
Alexander Nozdrin
5485e4475e Merge from mysql-next-mr. 2009-10-01 15:22:37 +04:00
Alexander Nozdrin
668c2c1f0f Update default.conf 2009-10-01 15:18:24 +04:00
Alexander Barkov
f3d36ea8d2 After-fix for back-port of WL#3759. 2009-10-01 12:22:31 +05:00
Joerg Bruehe
de0285a2e5 Merge "trunk-build" up into "next-mr". 2009-09-30 22:31:22 +02:00
Vladislav Vaintroub
6e6b84fd02 backport of
Revision: 
2597.72.1 revid:sp1r-Reggie@core.-20080403153947-15243
removed instances of __NT__ from code. We now only build "NT" binaries
2009-09-30 22:10:22 +02:00
Vladislav Vaintroub
9cf8d12c85 Backport of this changeset
http://lists.mysql.com/commits/59686

Cleanup pthread_self(), pthread_create(), pthread_join() implementation on Windows.
Prior implementation is was unnecessarily complicated and even differs in embedded
and non-embedded case.
      
Improvements in this patch:
* pthread_t is now the unique thread ID, instead of HANDLE returned by beginthread
      
This simplifies pthread_self() to be just straight GetCurrentThreadId().
prior it was much  art involved in passing the beginthread() handle from the caller
to the TLS structure in the child thread ( did not work for the main thread of
course)
      
* remove MySQL specific my_thread_init()/my_thread_end() from pthread_create.
No automagic is done on Unix on pthread_create(). Having the same on Windows will 
improve portability and avoid extra #ifdef's
      
* remove redefinition of getpid() - it was defined as GetCurrentThreadId()
2009-09-30 17:40:12 +02:00