Commit graph

53776 commits

Author SHA1 Message Date
istruewing@stella.local
0efc834e8a Merge stella.local:/home2/mydev/mysql-5.0-ateam
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2008-03-20 10:57:24 +01:00
istruewing@stella.local
f560b8c89c Merge stella.local:/home2/mydev/mysql-4.1-axmrg
into  stella.local:/home2/mydev/mysql-5.0-axmrg
2008-03-20 10:56:53 +01:00
anozdrin/alik@quad.
edd58be55d A test case for Bug#29958: Weird message on DROP DATABASE
if mysql.proc does not exist.
2008-03-20 11:36:35 +03:00
svoj@mysql.com/june.mysql.com
5309d2a521 BUG#34789 - drop server/create server leaks memory !
When CREATE SERVER is issued, it allocates memory on memory root
to store cached server structure. When DROP SERVER is issued,
it doesn't release this memory, as it is impossible with the
memory root.

We use the same allocation strategy for plugins and acl. The problem
here that there was no way (except for the server restart) to force
'servers' code to release this memory.

With this fix it is possible to release unused server cache memory
by FLUSH PRIVILEGES.

No test case for this fix.
2008-03-20 11:57:30 +04:00
svoj@mysql.com/june.mysql.com
0d5bd0c68e BUG#34790 - 'create server' doesn't handle out of memory scenario
well enough

CREATE SERVER may cause server crash if there is not enough memory
to execute this operation.

Fixed that create_server() and prepare_server_struct_for_insert()
didn't check return value of functions that allocate memory.

As this is out of memory issue fix, not test case available.
2008-03-20 11:40:26 +04:00
gshchepa/uchum@host.loc
9d03658bf2 Merge host.loc:/home/uchum/work/5.0-opt
into  host.loc:/home/uchum/work/5.1-opt
2008-03-20 02:44:08 +04:00
cmiller@zippy.cornsilk.net
897f772c14 Suggestion of Tim. Avoid unnecessary sleep. 2008-03-19 18:36:41 -04:00
cmiller@zippy.cornsilk.net
955983a154 Bug#30378: mysql.server needs to skip wait_for_pid() when mysqld \
isn't running

Pass the process id of the manager as a parameter to "wait_for_pid"
and if the manager isn't running, then do not continue to wait.

Also, capture the error message of our process-existence test, 
"kill -0", as we expect errors and shouldn't pass them to the user.  
Additionally, be a bit more descriptive of what the problem is.
2008-03-19 18:13:56 -04:00
tsmith@ramayana.hindu.god
2e2e904e4c Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-03-19 15:28:22 -06:00
tsmith@ramayana.hindu.god
79365b94c8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-03-19 14:59:48 -06:00
tsmith@ramayana.hindu.god
c4ee11bac6 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-03-19 14:57:35 -06:00
tsmith@ramayana.hindu.god
1f06d215e7 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-03-19 14:49:28 -06:00
gshchepa/uchum@host.loc
9b6f0f3a79 Merge host.loc:/home/uchum/work/PA/5.0-opt-34763
into  host.loc:/home/uchum/work/5.1-opt
2008-03-20 00:30:37 +04:00
gshchepa/uchum@host.loc
e57eaf0cef Merge host.loc:/home/uchum/work/PA/5.0-opt-34763
into  host.loc:/home/uchum/work/5.0-opt
2008-03-20 00:29:50 +04:00
tsmith@ramayana.hindu.god
203de67618 Merge ramayana.hindu.god:/home/tsmith/m/bk/b25486/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-03-19 13:44:50 -06:00
joerg@trift2.
34756947c0 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2008-03-19 20:31:37 +01:00
joerg@trift2.
25c9fd5961 Merge trift2.:/MySQL/M50/man8-5.0
into  trift2.:/MySQL/M51/man8-5.1
2008-03-19 19:59:08 +01:00
davi@endora.local
52e0664126 Merge mysql.com:/Users/davi/mysql/mysql-5.0-runtime
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-03-19 15:52:22 -03:00
joerg@trift2.
2e77233adc Merge trift2.:/MySQL/M41/push-4.1
into  trift2.:/MySQL/M50/push-5.0
2008-03-19 19:50:06 +01:00
joerg@trift2.
9ece3ac2df Merge trift2.:/MySQL/M41/man8-4.1
into  trift2.:/MySQL/M50/man8-5.0
2008-03-19 19:42:59 +01:00
joerg@trift2.
1137da47f9 Merge trift2.:/MySQL/M41/man8-4.1
into  trift2.:/MySQL/M41/push-4.1
2008-03-19 19:14:34 +01:00
joerg@trift2.
d4e7bf8709 support-files/mysql.spec.sh : Add the man pages for "ndbd" and "ndb_mgmd". 2008-03-19 19:13:28 +01:00
davi@mysql.com/endora.local
3958a755b9 Bug#30960 processlist state '*** DEAD ***' on recent 5.0.48 windows builds
The problem is that unimplemented WIN32 version of pthread_kill
is returning ESRCH no matter the arguments, causing calls to
mysqld_list_processes to set the procinfo to dead because
pthread_kill returns non zero. The dead procinfo would show
up on a second invocation of show processlist.
2008-03-19 15:01:03 -03:00
joerg@trift2.
c209b8399c Merge trift2.:/MySQL/M41/mysql-4.1
into  trift2.:/MySQL/M41/push-4.1
2008-03-19 18:44:21 +01:00
kaa@kaamos.(none)
938369446c Merge kaamos.(none):/data/src/opt/mysql-5.0-opt
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-19 16:33:41 +03:00
mhansson/martin@riffraff.(none)
86db2a0cd5 Bug#34529: Crash on complex Falcon I_S select after ALTER .. PARTITION BY
When swapping out heap I_S tables to disk, this is done after plan refinement.
Thus, READ_RECORD::file will still point to the (deleted) heap handler at start
of execution. This causes segmentation fault if join buffering is used and the 
query is a star query where the result is found to be empty before accessing
some table. In this case that table has not been initialized (i.e. had its 
READ_RECORD re-initialized) before the cleanup routine tries to close the handler.
Fixed by updating READ_RECORD::file when changing handler.
2008-03-19 14:32:28 +01:00
kaa@kaamos.(none)
cf68ce0fbf Merge kaamos.(none):/data/src/opt/bug34512/my51
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-19 16:31:26 +03:00
kaa@kaamos.(none)
a7d92c9879 Merge kaamos.(none):/data/src/opt/bug34512/my50
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
2008-03-19 16:30:56 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
635b44f19b Bug #33334 mysqltest_embedded crashes when disconnecting before reap.
Before breaking the connection we have to check that there's no query
  executing at the moment. Otherwise it can lead to crash in embedded server.
2008-03-19 15:51:22 +04:00
kaa@kaamos.(none)
e7d169fbde Merge kaamos.(none):/data/src/opt/bug34512/my50
into  kaamos.(none):/data/src/opt/bug34512/my51
2008-03-19 14:25:36 +03:00
kaa@kaamos.(none)
2b58fa027a Merge kaamos.(none):/data/src/opt/bug34650/my51
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-19 12:18:16 +03:00
svoj@mysql.com/june.mysql.com
6dfb184f09 BUG#34768 - nondeterministic INSERT using LIMIT logged in stmt mode if
binlog_format=mixed

Statement-based replication of DELETE ... LIMIT, UPDATE ... LIMIT,
INSERT ... SELECT ... LIMIT is not safe as order of rows is not
defined.

With this fix, we issue a warning that this statement is not safe to
replicate in statement mode, or go to row-based mode in mixed mode.

Note that we may consider a statement as safe if ORDER BY primary_key
is present. However it may confuse users to see very similiar statements
replicated differently.

Note 2: regular UPDATE statement (w/o LIMIT) is unsafe as well, but
this patch doesn't address this issue. See comment from Kristian
posted 18 Mar 10:55.
2008-03-18 20:25:34 +04:00
gluh@mysql.com/mgluh.(none)
106cd87059 Bug#35406 5.1-opt crashes on select from I_S.REFERENTIAL_CONSTRAINTS
added intialization of f_key_info.referenced_key_name for the case when
referenced table is dropped
2008-03-18 19:42:04 +04:00
svoj@april.(none)
65992efca6 Merge mysql.com:/home/svoj/devel/mysql/cov/mysql-5.0-engines
into  mysql.com:/home/svoj/devel/mysql/cov/mysql-5.1-engines
2008-03-18 16:39:33 +04:00
svoj@mysql.com/april.(none)
70ca2ae287 Make gcov happy. 2008-03-18 16:38:12 +04:00
thek@adventure.(none)
da813ebbee Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2008-03-18 13:31:10 +01:00
thek@adventure.(none)
2123884946 Merge adventure.(none):/home/thek/Development/cpp/bug25175/my51-bug25175
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
2008-03-18 13:29:14 +01:00
anozdrin/alik@quad.opbmk
a40867702c Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-03-18 14:13:33 +03:00
anozdrin/alik@quad.opbmk
50c37672a7 Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-merged
2008-03-18 13:53:51 +03:00
anozdrin/alik@quad.opbmk
fa6ed3cf36 Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1
into  quad.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
2008-03-18 13:51:17 +03:00
thek@adventure.(none)
cee1b1fd99 Bug#25175 Too much memory used by MySQL grant system
Each time the server reloads privileges containing table grants, the 
system will allocate too much memory than needed because of badly
chosen growth prediction in the underlying dynamic arrays.

This patch introduces a new signature to the hash container initializer
which enables a much more pessimistic approach in favour for more
efficient memory useage.

This patch was supplied by Google Inc.
2008-03-18 10:45:36 +01:00
kent/mysqldev@mysql.com/production.mysql.com
2536f33120 Raise version number after cloning 4.1.24 2008-03-18 00:57:57 +01:00
davi@buzz.(none)
b7f7c7dc35 Post-merge fixes for Bug 35103 2008-03-17 16:39:09 -03:00
davi@buzz.(none)
df5cf2b1de Merge buzz.(none):/home/davi/mysql-5.0-runtime
into  buzz.(none):/home/davi/mysql-5.1-runtime
2008-03-17 16:13:59 -03:00
mattiasj@witty.
7586a4c6c4 Bug#35306: partition_basic_symlink test failures
Have changed the DATA/INDEX dir to not be a database dir.
(and made some changes for better result files.)
2008-03-17 16:18:02 +01:00
mattiasj@witty.
d733351148 Bug#35305: partition_symlink test failures
Updated the test due to bug 32167

Corrected spelling of error message
2008-03-17 16:11:26 +01:00
mattiasj@witty.
d918fa6ec9 Valgrind warnings found after bug#32943 and after merge from -main
into -engines tree.

hander::table_share was not updated after changing table->s.
2008-03-17 15:56:53 +01:00
davi@mysql.com/endora.local
44fe22e727 Post-merge fix for Bug 35103. 2008-03-17 11:16:37 -03:00
anozdrin/alik@quad.
393c54db50 Avoid races in connect.test.
The problem was in a test case for Bug33507:
  - when the number of active connections reaches the limit,
    the server accepts only root connections. That's achieved by
    accepting a connection, negotiating with the client and
    checking user credentials. If it is not SUPER, the connection
    is dropped.
  - when the server accepts connection, it increases the counter;
  - when the server drops connection, it decreases the counter;
  - the race was in between of decreasing the counter and accepting
    new connection:
    - max_user_connections = 2;
    - 2 oridinary user connections accepted;
    - extra user connection is establishing;
    - server checked user credentials, and sent 'Too many connections'
      error;
    - the client receives the error and establishes extra SUPER user
      connection;
    - the server however didn't decrease the counter (the extra
      user connection still is "alive" in the server) -- so, the new
      SUPER-user connection, will be dropped, because it exceeds
      (max_user_connections + 1).

The fix is to implement "safe connect", which makes several attempts
to connect and use it in the test script.
2008-03-17 14:26:00 +03:00
anozdrin/alik@quad.
f2b39a5a5b A patch for Bug#35329: connect does not set mysql_errno variable.
The problem was that 'connect' command didn't set mysql_errno
variable, thus the script was unable to determine whether connection
was opened or not.

The fix is to set this variable.

Test cases will be added in the scope of Bug33507
into connect.test file.
2008-03-17 13:39:56 +03:00