mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-24 15:54:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40543 commits 2774 branches 343 tags 1.6 GiB
Commit graph

40543 commits

This branch
This branch
All branches
Author SHA1 Message Date
brian@zim.(none)
f0c661f1ac Refactored a number of engines to have correct init/deinit. Added pass support for "data" from plugin to plugin generic init to use memory location. 2006-11-19 18:01:54 -08:00
holyfoot/hf@deer.(none)
989117071a Merge mysql.com:/home/hf/work/mysql-5.0-0mrg 
into  mysql.com:/home/hf/work/mysql-5.1-mrg
 2006-11-19 22:26:36 +04:00
holyfoot/hf@mysql.com/deer.(none)
bcfed657e7 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-11-19 22:16:13 +04:00
holyfoot/hf@deer.(none)
bc840a7f8e Merge mysql.com:/home/hf/work/mysql-5.0-mrg 
into  mysql.com:/home/hf/work/mysql-5.1-mrg
 2006-11-19 22:13:20 +04:00
holyfoot/hf@mysql.com/deer.(none)
dbda18e9df Merge mysql.com:/home/hf/work/mysql-4.1-mrg 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-11-19 20:48:26 +04:00
holyfoot/hf@mysql.com/deer.(none)
40b22f3910 merging 2006-11-18 21:49:59 +04:00
kostja@bodhi.local
2fc4562d63 Port cleanups, trivial refactoring and code rearrangements from 
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for 
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
 2006-11-18 01:34:44 +03:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
540eb5ac4c Bug #24403 valgrind complained on uninited st_table, rbr + innodb 
open_table_from_share did not initialize table->record members. that was
  interpreted as the error by valgrind.
  
  Fixed with bzero-ing the members if compilation with -DHAVE_purify.
 2006-11-17 23:44:14 +02:00
kostja@bodhi.local
d2248d973e A post-merge fix. 2006-11-17 20:07:52 +03:00
df@mysql.com/kahlann.erinye.com
98806bd6ec Merge mysql.com:/home/df/mysql/build/mysql-5.0-build-work 
into  mysql.com:/home/df/mysql/build/mysql-5.1-build
 2006-11-17 17:09:52 +01:00
dfischer/df@kahlann.erinye.com
bc8c59c1a8 adaption from 4.1 2006-11-17 17:02:28 +01:00
dfischer/df@kahlann.erinye.com
88ac15ddd1 MTR_BUILD_THREAD=auto selects a value for MTR_BUILD_THREAD from a pool (WL#2690) 2006-11-17 16:52:21 +01:00
joerg@trift2.
16cb323429 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-17 16:33:11 +01:00
joerg@trift2.
f9e9ce60e8 Merge trift2.:/MySQL/M50/yassl-win-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-17 16:30:08 +01:00
kostja@bodhi.local
33bbdf5c25 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.local:/opt/local/work/m51lamp
 2006-11-17 18:19:49 +03:00
joerg@trift2.
0aee63517e Maintain the (old) VC project files, ehere yaSSL is concerned: 
"mySTL" has become a subdirectory of "taocrypt", was a sibling previously.
 2006-11-17 16:09:37 +01:00
holyfoot/hf@deer.(none)
7d190dd6b1 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/mysql-5.1-mrg
 2006-11-17 19:01:35 +04:00
holyfoot/hf@deer.(none)
dd0b81885d Merge mysql.com:/home/hf/work/mysql-5.0-mrg 
into  mysql.com:/home/hf/work/mysql-5.1-mrg
 2006-11-17 18:27:28 +04:00
anozdrin/alik@alik.
c6cd61a5cc Polishing: generate more warnings and make code warnings-free. 2006-11-17 16:45:29 +03:00
kostja@bodhi.local
7278f45bfd Replace the approach using Foo_thread_args + Foo_thread and manually 
spawned threads with a reusable class Thread.

This is the second idea implemented in the Alik's patch for
BUG#22306: STOP INSTANCE can not be applied for instances in Crashed,
Failed and Abandoned.
Commiting separately to ease review process.
 2006-11-17 16:11:04 +03:00
kroki/tomash@moonlight.intranet
f8149f79a3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
 2006-11-17 15:04:26 +03:00
kroki/tomash@moonlight.intranet
f6e4e2317e Fix after manual merge: remove dead declaration. 2006-11-17 13:56:11 +03:00
holyfoot/hf@mysql.com/deer.(none)
5906c3868f ABI fix 2006-11-17 14:30:08 +04:00
kroki/tomash@moonlight.intranet
d1af1d5c29 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383
 2006-11-17 12:41:17 +03:00
kroki/tomash@moonlight.intranet
e7ebeac561 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
 2006-11-17 12:40:42 +03:00
kroki/tomash@moonlight.intranet
8c55f4743d Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23383
 2006-11-17 12:39:55 +03:00
kroki/tomash@moonlight.intranet
1f699a4422 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23383
 2006-11-17 12:33:59 +03:00
kroki/tomash@moonlight.intranet
6d4558f7c3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
 2006-11-17 12:30:26 +03:00
kroki/tomash@moonlight.intranet
5e2ef3a68e BUG#23383: mysql_affected_rows() returns different values than 
mysql_stmt_affected_rows()

The problem was that affected_rows for prepared statement wasn't updated
in the client library on the error.  The solution is to always update
affected_rows, which will be equal to -1 on the error.
 2006-11-17 12:21:32 +03:00
holyfoot/hf@mysql.com/deer.(none)
dac2d0fcba merging 2006-11-17 12:02:36 +04:00
holyfoot/hf@mysql.com/deer.(none)
950665fc3b merging 2006-11-17 11:15:40 +04:00
holyfoot/hf@mysql.com/deer.(none)
e95e23b0f3 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/mysql-5.0-0mrg
 2006-11-17 10:30:16 +04:00
bell@desktop.sanja.is.com.ua
d56ab5afb6 Fix of debbuging mode of query cache (proposed by Monty reviewed by me). 2006-11-17 08:18:10 +02:00
kostja@bodhi.local
2f69dfb28f Cleanup: manually port the polishing parts from Alik's changeset for 
BUG#22306: STOP INSTANCE can not be applied for instances in Crashed,
Failed and Abandoned
 2006-11-16 23:36:20 +03:00
joerg@trift2.
d2b5c88846 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-16 21:09:34 +01:00
joerg@trift2.
7ede3508c8 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-16 21:07:08 +01:00
joerg@trift2.
3a12df0bb9 Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-11-16 21:04:01 +01:00
joerg@trift2.
aa5b64f98b Merge trift2.:/MySQL/M50/tmp-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-16 21:01:52 +01:00
holyfoot/hf@mysql.com/deer.(none)
497ccd6b87 Merge mysql.com:/home/hf/work/mysql-4.1-mrg 
into  mysql.com:/home/hf/work/mysql-5.0-mrg
 2006-11-16 23:16:44 +04:00
holyfoot/hf@mysql.com/deer.(none)
e7cde72651 merging 2006-11-16 23:00:48 +04:00
joerg@trift2.
0fad5fed44 Merge trift2.:/MySQL/M51/bug22081-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-16 19:01:35 +01:00
holyfoot/hf@mysql.com/deer.(none)
2963d8ddd2 merging 2006-11-16 21:23:34 +04:00
malff/marcsql@weblab.(none)
e8d51e62bb Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-22684
 2006-11-16 10:06:36 -07:00
holyfoot/hf@mysql.com/deer.(none)
db5db841a9 Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mysql-4.1-mrg
 2006-11-16 20:44:37 +04:00
malff/marcsql@weblab.(none)
ccfbd68615 Bug#22684 (BENCHMARK, ENCODE, DECODE and FORMAT are not real functions) 
Before this change, the functions BENCHMARK, ENCODE, DECODE and FORMAT could
only accept a constant for some parameters.

After this change, this restriction has been removed. An implication is that
these functions can also be used in prepared statements.

The change consist of changing the following classes:
- Item_func_benchmark
- Item_func_encode
- Item_func_decode
- Item_func_format
to:
- only accept Item* in the constructor,
- and evaluate arguments during calls to val_xxx()
which fits the general design of all the other functions.

The 'TODO' items identified in item_create.cc during the work done for
Bug 21114 are addressed by this fix, as a natural consequence of aligning
the design.

In the 'func_str' test, a single very long test line involving an explain
extended select with many functions has been rewritten into multiple
separate tests, to improve maintainability.
The result of explain extended select decode(encode(...)) has changed,
since the encode and decode functions now print all their parameters.
 2006-11-16 09:03:47 -07:00
joerg@trift2.
7750d852ac Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-16 15:26:37 +01:00
joerg@trift2.
43cd9427e2 Merge trift2.:/MySQL/M50/bug22081-5.0 
into  trift2.:/MySQL/M51/bug22081-5.1
 2006-11-16 15:16:51 +01:00
joerg@trift2.
a2b1f2c187 Merge trift2.:/MySQL/M50/bug22081-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-16 14:47:05 +01:00
joerg@trift2.
818f3fa21f Merge trift2.:/MySQL/M41/bug22081-4.1 
into  trift2.:/MySQL/M50/bug22081-5.0
 2006-11-16 14:38:15 +01:00
joerg@trift2.
29dd8d2e58 support-files/mysql.spec.sh : Add an "Obsoletes" note relative to SuSE RPMs (bug#22081). 2006-11-16 14:01:31 +01:00