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

31226 commits

This branch
This branch
All branches
Author SHA1 Message Date
holyfoot/hf@mysql.com/deer.(none)
6ea52f90bf Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.19672
 2006-07-21 13:27:05 +05:00
jimw@rama.(none)
78a2b9420c Merge bk-internal:/home/bk/mysql-5.0-kt 
into  rama.(none):/home/jimw/my/mysql-5.0-12673
 2006-07-18 09:43:23 -07:00
jimw@rama.(none)
3fb0f420ac Merge bk-internal:/home/bk/mysql-5.0-kt 
into  rama.(none):/home/jimw/my/mysql-5.0-17485
 2006-07-17 12:55:36 -07:00
tnurnberg@mysql.com/salvation.intern.azundris.com
7350cb8b5e Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/tnurnberg/work/mysql-5.0-21014
 2006-07-14 01:26:19 +02:00
tnurnberg@mysql.com/salvation.intern.azundris.com
4316f715d3 Bug#21014: Segmentation fault of mysqldump on view 
mysqldump did not select the correct database before trying to dump
views from it. this resulted in an empty result set, which in turn
startled mysql-dump into a core-dump.  this only happened for views,
not for tables, and was only visible with multiple databases that
weren't by sheer luck in the order mysqldump required, anyway. this
fixes by selecting the correct database before dumping views; it also
catches the empty set-condition if it should occur for other reasons.
 2006-07-14 01:25:13 +02:00
cmiller@zippy.(none)
878107eb4a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/m50--07C2P
 2006-07-13 13:01:30 -04:00
cmiller@zippy.(none)
87dd9b978c Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
 2006-07-13 11:12:41 -04:00
cmiller@zippy.(none)
2c5308a703 Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
 2006-07-13 11:11:20 -04:00
iggy@rolltop.ignatz42.dyndns.org
d3eab1ca35 Bug #19779: mysql_explain_log documentation is outdated. 2006-07-13 10:48:34 -04:00
holyfoot/hf@mysql.com/deer.(none)
94ec899824 Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.clean
 2006-07-13 14:25:58 +05:00
jimw@rama.(none)
a34f37acdd Bug #12673: Instance Manager: allows to stop the instance many times 
The instance manager was not actually checking whether an instance
  was actually running before trying to stop it. Now it checks first.
 2006-07-12 12:30:22 -07:00
cmiller@zippy.(none)
4980c64a5b Merge zippy.(none):/home/cmiller/mysql-4.1_bug18470 
into  zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P
 2006-07-12 11:39:12 -04:00
kostja@bodhi.local
bd183d42dc Fix a valgrind warning in type_date test. 2006-07-12 19:19:43 +04:00
cmiller@calliope.local
834111811b Bug#18470: Compile Failure: strings.s fails make with unknown pseudo-ops 
The bug is thqt we use some nonstandard assembly codes in our strings
source, and some assemblers don't know what to do with them:  Specifically,
Sun's Solaris assembler and Apple's Darwin assembler balk at them.

This patch, rather than trying to test for properties of the assembler, 
which Autoconf doesn't have any decent facilites for, instead tries to
compile the code in question and disables assembly if it fails.

There's still the problem of unportable assembly, but I'll leave that 
to someone who feels like rewriting and debugging it.
 2006-07-12 10:26:19 -04:00
mkindahl@dl145k.mysql.com
8e7754c9b2 Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0 
into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.0-rpl
 2006-07-12 10:05:55 +02:00
jimw@rama.(none)
9a2a3c6edf Bug #17485: mysql client crashes when connecting to the Instance Manager 
Using \U or \u in a prompt with the mysql command-line client could
  crash when connecting to the instance manager, since it does not return
  information about the user when asked by the client. This is fixed by
  having the client use what it knowns about the user (or giving up and
  saying "(unknown)").
 2006-07-11 12:42:03 -07:00
kostja@bodhi.local
fbf54f8d72 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-11 17:04:27 +04:00
ingo/mydev@chilla.local
50b630ba7c Merge chilla.local:/home/mydev/mysql-5.0-release 
into  chilla.local:/home/mydev/mysql-5.0-amerge
 2006-07-11 13:01:27 +02:00
joerg@trift2.
6b9e4ff960 Raise the version number. 2006-07-11 12:34:43 +02:00
joerg@trift2.
7027740d6e Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  trift2.:/M50/mysql-5.0
 2006-07-11 11:32:45 +02:00
mkindahl@dl145k.mysql.com
34ca2ecd3d Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0-rpl 
into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.0-merge
 2006-07-11 11:15:22 +02:00
kostja@bodhi.local
77285cb650 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-11 08:36:50 +04:00
kostja@bodhi.local
4f3636dd5a Fix yet another Windows build failure: "true" -> TRUE 2006-07-11 01:46:44 +04:00
joerg@trift2.
90d80ffd81 Merge trift2.:/M50/clone-5.0 
into  trift2.:/M50/mysql-5.0
 2006-07-10 22:40:57 +02:00
joerg@trift2.
cf2d51c3f7 Raise the version number. 2006-07-10 22:38:13 +02:00
cmiller@zippy.(none)
e62e730020 A patch to Bug#17667 didn't take into consideration that the vardir, which contains 
the server's binlog file, might be set to a different directory.  This adds a new
"vardir" parameter, which takes the name of the directory as a value, so that the 
test_bug17667() test can find the binlog.
 2006-07-10 16:38:03 -04:00
kostja@bodhi.local
171bcbf339 Fix a Windows build failure. 2006-07-10 23:58:36 +04:00
ingo/mydev@chilla.local
dfaa3c78f6 Revoking patch for Bug#10952 on behalf of Brian. 2006-07-10 20:46:05 +02:00
guilhem@gbichot3.local
02c17dfb17 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  gbichot3.local:/home/mysql_src/mysql-5.0
 2006-07-10 17:06:19 +02:00
kostja@bodhi.local
d7f5d73fc2 Fix test results to be vardir-independent. 2006-07-10 16:22:42 +04:00
pekka@orca.ndb.mysql.com
72fa4883cf Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2
 2006-07-10 14:12:02 +02:00
pekka@orca.ndb.mysql.com
9f3b47e53c ndb - bug#18781: close a tiny window (re-commit, try to by-pass merge jam) 2006-07-10 13:59:13 +02:00
pekka@orca.ndb.mysql.com
7c83e6d201 ndb - bug#18781 : 5.0 : add NODE_START_REP from 5.1 (re-commit, try to by-pass merge jam) 2006-07-10 13:44:15 +02:00
kostja@bodhi.local
f183c08476 A post-merge fix (Bug#8706 "temporary table with data directory option 
fails"
 2006-07-10 14:53:49 +04:00
kostja@bodhi.local
746749ed75 Add sql_locale.cpp to our windows build scripts. 2006-07-10 14:30:17 +04:00
pekka@orca.ndb.mysql.com
023f44356f Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50
 2006-07-10 12:15:34 +02:00
pekka@orca.ndb.mysql.com
bdc7a14bba ndb - bug#20847: non-debug compile fix (repeat since cannot merge 4.1->5.0) 2006-07-10 12:13:45 +02:00
aelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi
64d096f988 Merge dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/4.1 
into  dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/FIXES/5.0/20919_temp_nlog
 2006-07-10 13:11:29 +03:00
joerg@trift2.
4fbf8f2fc0 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  trift2.:/M50/mysql-5.0
 2006-07-10 12:08:55 +02:00
joerg@trift2.
6ec62524b3 support-files/mysql.spec.sh : Fix a typing error. 2006-07-10 12:03:44 +02:00
joerg@trift2.
94ef9ca9ca Merge trift2.:/M50/clone-5.0 
into  trift2.:/M50/back23-5.0
 2006-07-10 11:42:45 +02:00
pekka@orca.ndb.mysql.com
7433d5ccbe Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
 2006-07-10 11:31:37 +02:00
pekka@orca.ndb.mysql.com
79cc3bed10 mysql-test/Makefile.am: fix cp of mode 444 files (re-commit) 2006-07-10 11:09:32 +02:00
pekka@orca.ndb.mysql.com
71aa094c68 Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my50 
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-bug20847
 2006-07-10 11:02:46 +02:00
aelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi
fadbdf27c3 BUG#20919 temp tables closing fails when binlog is off 
closing temp tables through end_thread
had a flaw in binlog-off branch of close_temporary_tables where
next table to close was reset via table->next
 for (table= thd->temporary_tables; table; table= table->next)
which was wrong since the current table instance got destoyed at
	close_temporary(table, 1);

The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying.
 2006-07-10 00:26:26 +03:00
kostja@bodhi.local
2ab1e065e4 Fix compiler warnings in sql_udf.h: ISO C++ forbids casting 
between pointer to function and pointer to object.
 2006-07-09 13:03:51 +04:00
kostja@bodhi.local
f1d949a856 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-08 21:45:02 +04:00
ingo/mydev@chilla.local
f631765a06 Merge chilla.local:/home/mydev/mysql-5.0--main 
into  chilla.local:/home/mydev/mysql-5.0-amerge
 2006-07-08 16:50:50 +02:00
kostja@bodhi.local
ff1947da1e A post-merge fix. 2006-07-08 04:07:43 +04:00
kostja@bodhi.local
a2c0cdd75b Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-08 02:30:07 +04:00