mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
51035 commits 2793 branches 343 tags 1.5 GiB
Commit graph

51035 commits

This branch
This branch
All branches
Author SHA1 Message Date
davi@endora.
7ec50bd483 Merge endora.local:/Users/davi/mysql/bugs/31669-5.1 
into  endora.local:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-31 13:57:54 -02:00
davi@endora.local/endora
8620673f93 Post merge fix for bug 31669. 2007-10-31 13:54:53 -02:00
kostja@bodhi.(none)
3154b2bee4 Cleanup: rename select_send::status to select_send::is_result_set_started. 
Add select_send::cleanup.
Fix a compilation warning.
Issues spotted while working on the fix for Bug#12713.
 2007-10-31 18:33:13 +03:00
kostja@bodhi.(none)
fdcf20d733 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime-inc
 2007-10-31 17:30:46 +03:00
kostja@bodhi.(none)
96f8d086f8 Cleanup: use helper functions to set an error in MYSQL or MYSQL_STMT. 
No functionality added or changed.
This is a pre-requisite for the fix for Bug#12713 Error in a stored 
function called from a SELECT doesn't cause ROLLBACK of statem

Address post-review comments.
 2007-10-31 17:16:53 +03:00
anozdrin/alik@station.
3284c99694 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-bug31649
 2007-10-31 15:54:02 +03:00
thek@adventure.(none)
95a74f6717 Merge adventure.(none):/home/thek/Development/cpp/bug31347/my50-bug31347 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
 2007-10-31 13:41:49 +01:00
thek@adventure.(none)
19f1330e69 Merge adventure.(none):/home/thek/Development/cpp/bug31347/my51-bug31347 
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
 2007-10-31 13:22:19 +01:00
istruewing@stella.local
3707119e2e Merge stella.local:/home2/mydev/mysql-5.0-axmrg 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-10-31 13:14:02 +01:00
istruewing@stella.local
8b1679d769 Merge stella.local:/home2/mydev/mysql-5.1-amain 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
 2007-10-31 13:13:20 +01:00
thek@adventure.(none)
5b603aa47a Merge adventure.(none):/home/thek/Development/cpp/bug31347/my50-bug31347 
into  adventure.(none):/home/thek/Development/cpp/bug31347/my51-bug31347
 2007-10-31 13:12:45 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
edbf4120f6 Bug #31893 Partitions: crash if subpartitions and engine change. 
The new default database engine for altered table was reassigned to
the old one. That's wrong thing by itself, and (as the engine
for a subpartition gets that new value) leads to DBUG_ASSERTION
in mysql_unpack_partition()
 2007-10-31 16:01:29 +04:00
istruewing@stella.local
4998e0d89c Merge stella.local:/home2/mydev/mysql-4.1-axmrg 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-10-31 12:32:03 +01:00
istruewing@stella.local
cd49a77add Merge stella.local:/home2/mydev/mysql-5.0-amain 
into  stella.local:/home2/mydev/mysql-5.0-axmrg
 2007-10-31 12:31:36 +01:00
thek@adventure.(none)
8549a8ea8f Bug#31347 Increase in memory usage after many DROP USER statements 
Dropping users causes huge increase in memory usage because field values were
allocated on the server memory root for temporary usage but never deallocated.

This patch changes the target memory root to be that of the thread handler
instead since this root is cleared between each statement.
 2007-10-31 12:25:18 +01:00
kent@kent-amd64.(none)
b5e97b4b04 Merge mysql.com:/home/kent/bk/bug24809/mysql-5.0-build 
into  mysql.com:/home/kent/bk/bug24809/mysql-5.1-build
 2007-10-31 10:52:18 +01:00
anozdrin/alik@station.
62d2ee935e Fix for a BUG#31649: events.test fails: NULL "state" field of 
SHOW PROCESSLIST.

The problem was a race condition: if the Event Scheduler was not
quick enough, the following scenario happens:
  - The Event Scheduler picks up the created event;
  - The event is executed;
  - event_scheduler_thread->proc_info is set to NULL;
  - The client issues SELECT FROM I_S.

The fix is to wait for the Event Scheduler to reach 'Waiting
for next activation' state.
 2007-10-31 12:04:19 +03:00
anozdrin/alik@station.
4852cc7fc4 Fix result files after patch for BUG#31035. 2007-10-31 09:53:58 +03:00
davi@endora.local
cdf589c8b4 Merge endora.local:/Users/davi/mysql/bugs/31669-5.1 
into  endora.local:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-31 02:06:17 -02:00
davi@endora.local
53a048662a Merge endora.local:/Users/davi/mysql/mysql-5.0-runtime 
into  endora.local:/Users/davi/mysql/bugs/31669-5.1
 2007-10-31 02:04:04 -02:00
istruewing@stella.local
f380491231 Merge stella.local:/home2/mydev/mysql-4.1-amain 
into  stella.local:/home2/mydev/mysql-4.1-axmrg
 2007-10-31 00:50:03 +01:00
davi@endora.local
f3e0d95f45 Merge endora.local:/Users/davi/mysql/bugs/30904-5.1 
into  endora.local:/Users/davi/mysql/mysql-5.1-runtime
 2007-10-30 20:52:21 -02:00
davi@endora.local
756a86f06d Bug#30904 SET PASSWORD statement is non-transactional 
The SET PASSWORD statement is non-transactional (no explicit transaction
boundaries) in nature and hence is forbidden inside stored functions and
triggers, but it weren't being effectively forbidden.

The implemented fix is to issue a implicit commit with every SET PASSWORD
statement, effectively prohibiting these statements in stored functions
and triggers.
 2007-10-30 20:51:04 -02:00
kent@mysql.com/kent-amd64.(none)
2f88dce6ff Makefile.am: 
Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)
 2007-10-30 20:54:31 +01:00
kostja@bodhi.(none)
230604f33c In ha_delete_table, use a standard mechanism to intercept the error message 
and convert it to a warning instead of direct manipulation with the
thread error stack.
Fix a bug in handler::print_erorr when a garbled message was
printed for HA_ERR_NO_SUCH_TABLE.
This is a pre-requisite patch for the fix for Bug#12713 Error in a stored
function called from a SELECT doesn't cause ROLLBACK of statem
 2007-10-30 22:35:14 +03:00
joerg@trift2.
37e47a080a Minor Makefile fixes: 
1) Add a new top level "Makefile.am" target "make embedded-test".

2) Fix a syntax error (bad merge) in "netware/Makefile.am".
 2007-10-30 20:06:49 +01:00
kostja@bodhi.(none)
cd72fffa5f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime-inc-2
 2007-10-30 20:10:11 +03:00
kostja@bodhi.(none)
e4b353c40c Use an inline getter method (thd->is_error()) to query if there is an error 
in THD.
In future the error may be stored elsewhere (not in net.report_error) and 
it's important to start using an opaque getter to simplify merges.
 2007-10-30 20:08:16 +03:00
antony@pcg5ppc.xiphis.org
ff184f202f Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/p2-bug30296.1 
into  pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/p2-bug30296.1-merge-5.1
 2007-10-30 10:07:24 -07:00
df@pippilotta.erinye.com
d76498a6a2 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-10-30 15:48:25 +01:00
df@pippilotta.erinye.com
3c3c7d0203 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-10-30 15:39:02 +01:00
df@pippilotta.erinye.com
220add0366 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-10-30 15:37:48 +01:00
df@pippilotta.erinye.com
c72c86713e Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-10-30 15:33:41 +01:00
df@pippilotta.erinye.com
c4ab8a9395 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-10-30 15:24:17 +01:00
df@pippilotta.erinye.com
e5b809333c bug#30630 2007-10-30 15:22:52 +01:00
gkodinov/kgeorge@magare.gmz
055e3e78ce Merge magare.gmz:/home/kgeorge/mysql/autopush/B31884-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31884-5.1-opt
 2007-10-30 16:22:35 +02:00
gkodinov/kgeorge@magare.gmz
a9e65c8940 Merge magare.gmz:/home/kgeorge/mysql/work/B31884-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B31884-5.1-opt
 2007-10-30 16:21:17 +02:00
gkodinov/kgeorge@magare.gmz
f370e4b3d4 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B31884-5.0-opt
 2007-10-30 16:18:56 +02:00
tomas@whalegate.ndb.mysql.com
38ce0fc24d correct result file 2007-10-30 14:52:12 +01:00
tomas@whalegate.ndb.mysql.com
b0e90a43cb correct manual merge 2007-10-30 14:04:41 +01:00
davi@moksha.com.br
26f03b0bc6 Merge moksha.local:/Users/davi/mysql/bugs/31669-5.0 
into  moksha.local:/Users/davi/mysql/mysql-5.0-runtime
 2007-10-30 09:41:24 -03:00
kostja@bodhi.(none)
5a09edd203 Fix failing init_connect.test (5.1-runtime). 2007-10-30 15:39:50 +03:00
gkodinov/kgeorge@magare.gmz
01fe24cd68 Bug #31884: Assertion + crash in subquery in the SELECT clause. 
Item_in_subselect's only externally callable method is val_bool().
However the nullability in the wrapper class (Item_in_optimizer) is 
established by calling the "forbidden" method val_int().

Fixed to use the correct method (val_bool() ) to establish nullability 
of Item_in_subselect in Item_in_optimizer.
 2007-10-30 14:27:21 +02:00
kostja@bodhi.(none)
47c381fbb4 Make sure rpl.rpl_innodb_mixed_dml passes even if rpl_mixed.dat is read-only. 
This is important for a development environment where not all source files
are checked out.
 2007-10-30 15:25:39 +03:00
istruewing@stella.local
250f5769bf Post-merge fix 2007-10-30 12:03:44 +01:00
svoj@mysql.com/june.mysql.com
cbd3dfbbcb BUG#11392 - fulltext search bug 
Fulltext boolean mode phrase search may crash server on platforms
where size of pointer is not equal to size of unsigned integer
(in other words some 64-bit platforms).

The problem was integer overflow.

Affects 4.1 only.
 2007-10-30 14:46:43 +04:00
tomas@whalegate.ndb.mysql.com
a214b1b9ba Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2007-10-30 11:28:19 +01:00
istruewing@stella.local
7aa8144460 Merge stella.local:/home2/mydev/mysql-5.0-bug4692 
into  stella.local:/home2/mydev/mysql-5.1-bug4692
 2007-10-30 09:51:05 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
e93574e9d1 Bug #31758 inet_ntoa, oct crashes server with null+filesort 
Item_func_inet_ntoa and Item_func_conv inherit 'maybe_null' flag from an
argument, which is wrong.
Both can be NULL with notnull arguments, so that's fixed.
 2007-10-30 12:35:03 +04:00
joerg@trift2.
c836873a8f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-10-29 23:13:28 +01:00