mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity
37,733 commits 3,563 branches 376 tags 1.8 GiB
Commit graph

37,733 commits

This branch
This branch
All branches
Author SHA1 Message Date
dlenev@mockturtle.local
5ba1b83c98 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-rt-merge
 2006-09-14 23:53:35 +04:00
andrey@example.com
850ac2e898 Temporary fix for a deadlock. Needed so we can go with cloning 
5.1.12.
 2006-09-14 13:49:26 +02:00
ahristov@bk-internal.mysql.com
895a4442de event_queue.cc: 
fix sigsegv
 2006-09-13 16:55:15 +02:00
timour/timka@lamia.home
fad645f23e Merge lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm 
into  lamia.home:/home/timka/mysql/src/5.1-dbg
 2006-09-13 15:22:50 +03:00
tsmith@maint2.mysql.com
a1c4a48b7e Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg/g51 
into  maint2.mysql.com:/data/localhome/tsmith/bk/mrg/51
 2006-09-12 19:40:00 +02:00
andrey@example.com
2ef67ec2e5 ws fix 2006-09-12 17:48:26 +02:00
timour/timka@lamia.home
38a450b44a Fix for BUG#21774: Column count doesn't match value count at row x 
The cause of the bug was an incomplete fix for bug 18080.
The problem was that setup_tables() unconditionally reset the
name resolution context to its 'tables' argument, which pointed
to the first table of an SQL statement.

The bug fix limits resetting of the name resolution context in
setup_tables() only in the cases when the context was not set
by earlier parser/optimizer phases.
 2006-09-12 17:50:24 +03:00
msvensson@neptunus.(none)
7b7e66763c Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNOBASE_STORAGE_ENGINE to work 2006-09-12 16:43:57 +02:00
msvensson@neptunus.(none)
f6ce081f6a Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-12 16:13:00 +02:00
msvensson@neptunus.(none)
5a6cee9e1c Merge neptunus.(none):/home/msvensson/mysql/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-12 15:38:02 +02:00
msvensson@neptunus.(none)
da9724c992 Merge neptunus.(none):/home/msvensson/mysql/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-12 15:34:55 +02:00
msvensson@neptunus.(none)
4ae7c5a429 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-12 14:49:41 +02:00
andrey@example.com
214f1d15cc remove warning 2006-09-12 14:45:31 +02:00
Kristofer.Pettersson@naruto.
53bb0bdcda Merge naruto.:C:/cpp/bug20789/my50-bug20789 
into  naruto.:C:/cpp/mysql-5.1-maint
 2006-09-12 14:34:01 +02:00
Kristofer.Pettersson@naruto.
323efcc0c1 Bug#20789 Merge Subtable Rename Causes Crash 
- When an ALTER TABLE RENAME is performed on windows, the files are closed and their cached file 
   descriptors are marked invalid. Performing INSERT, UPDATE or SELECT on the associated merge
   table causes a server crash on windows. This patch adds a test for bad file descriptors when a 
   table attempts a lock. If a bad descriptor is found an error is thrown. An additional FLUSH TABLES
   will be necessary to further operate on the associated merge table.
 2006-09-12 14:23:41 +02:00
andrey@example.com
6eaf89b8e7 correct prototype 2006-09-12 13:24:07 +02:00
andrey@example.com
25862a8671 WL#3337 (Event scheduler new architecture) 
Remove SHOW SCHEDULER STATUS command and migrate the
information output to `mysqladmin debug` (COM_DEBUG)

SHOW SCHEDULER STATUS was introduced in 5.1.11, provided
some debug information about event scheduler internals and
was enabled only in debug builds.
 2006-09-12 12:26:12 +02:00
rburnett@production.mysql.com
db89fb33aa log.cc: 
Fixing failed merge
 2006-09-12 04:46:41 +02:00
cmiller@maint1.mysql.com
9b18cae31b Change stolen from the -win tree. 
More specifically, the scripts/Makefile isn't created and it doesn't
translate mysql_fix_privilege_tables ".sh" .  So, 
mysql-test/mysql-test-run.pl doesn't find the binary and substitutes 
/bin/false instead.  That obviously doesn't "fix" anything and the 
test fails because of it.
 2006-09-12 03:39:58 +02:00
rburnett@bk-internal.mysql.com
cf1a0b3250 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-09-11 16:43:56 +02:00
msvensson@shellback.(none)
a1810201f6 Use the mtr_file_exists function to detect if ndbapi_example is available 2006-09-11 12:15:04 +02:00
serg@janus.mylan
28b90bfab5 bugfix 2006-09-09 10:39:12 +02:00
serg@janus.mylan
62b5c384df Merge bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1-arch
 2006-09-09 10:27:12 +02:00
msvensson@shellback.(none)
d54cbe9120 "crash_commit_before" need innodb 2006-09-08 16:26:35 +02:00
msvensson@shellback.(none)
e03a0617a0 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-08 16:01:51 +02:00
msvensson@shellback.(none)
8ce37febef Fix problem running mysql-test-run.pl when running in a clone not compiled with ndb support 2006-09-08 15:55:11 +02:00
msvensson@shellback.(none)
5ac62fd1d6 Bug#21855 Compilation error in ha_innodb.cc 
- Add ifdefs in ha_innodb.cc so it's only compiled if we have selected to build mysqld with innodb.
   This is inline with how it's done in other handlers.
 2006-09-08 15:42:49 +02:00
msvensson@shellback.(none)
f366dfc8e0 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-08 09:37:08 +02:00
brian@zim.(none)
aa52207c11 Warning fixes for Windows, and an include fix for Windows for Innodb. 2006-09-07 16:17:16 -07:00
andrey@example.com
83f4f3b2aa fix build 2006-09-08 00:49:37 +02:00
brian@zim.(none)
0668eee261 Add support for Falcon, so that partitioning can be tested. 2006-09-07 12:35:52 -07:00
brian@zim.(none)
7cc71499db Fix for a compile problem in Windows. 2006-09-07 12:34:12 -07:00
brian@zim.(none)
80a8f2c12b Adding in a few more engines to the now defunct (but still used) handler enum's since its the only way to enable for partitioning. 2006-09-07 12:12:52 -07:00
brian@zim.(none)
a80a8ecd85 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/merge-5.1
 2006-09-07 08:49:33 -07:00
brian@zim.(none)
5e46ea7f03 Moves Innodb handler to the Innodb storage directory. 2006-09-07 08:23:58 -07:00
serg@janus.mylan
a057d38514 cleanup of pligin removal code 
fixed multiple and missing deinitializations, moved all
deinit/del code in one place
 2006-09-07 15:01:36 +02:00
serg@janus.mylan
e1db08e1da minor plugin api fixes: 
remove #define __attribute__(A) from plugin.h
increase API version because placeholders were added
more robust definition of min_plugin_interface_version
 2006-09-07 12:56:32 +02:00
arjen@mysql.com/albus.bitbike.com
f5cebbdfba errmsg.txt: 
Update of Dutch errmsg translations (not complete yet)
errmsg.h:
  Fixup of changed error message file path in comment
authors.h:
  Ego add.
 2006-09-07 13:52:30 +10:00
rburnett@bk-internal.mysql.com
e70867872b Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-09-07 04:48:29 +02:00
tnurnberg@mysql.com/salvation.intern.azundris.com
330ae3e29d make partition_mgm test deterministic wrt results of ls 2006-09-07 04:18:17 +02:00
tnurnberg@salvation.intern.azundris.com
c9645e9c6d Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  salvation.intern.azundris.com:/home/tnurnberg/21913/my51-21913
 2006-09-07 02:58:47 +02:00
tsmith@maint1.mysql.com
84bf16ec40 Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/51
 2006-09-07 01:56:49 +02:00
tsmith@maint1.mysql.com
8991a269f1 Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my51-bfx
 2006-09-07 01:07:24 +02:00
tsmith@maint1.mysql.com
b5f67a642f Merge maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my41-bfx 
into  maint1.mysql.com:/data/localhome/tsmith/bk/bfx/my50-bfx
 2006-09-07 00:59:08 +02:00
tsmith@maint1.mysql.com
2480ec8e3e Force conflict to avoid bk automerge behavior; will be undone during merge. 2006-09-07 00:54:48 +02:00
jimw@rama.(none)
75fdb8fa6a Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-09-06 15:41:16 -07:00
tsmith@maint1.mysql.com
b6cd727ed1 Bug #21054: myisam_stats_method ignored in my.cnf and cmdline 
Fix OPT_MYISAM_STATS_METHOD case, where the NULLS_EQUAL and NULLS_NOT_EQUAL methods were mixed up
 2006-09-07 00:11:43 +02:00
tsmith@maint1.mysql.com
f4265f7a57 Bug #21250: esolve stack traces on AMD64 (backport to mysql-4.1) 2006-09-07 00:01:00 +02:00
cmiller@zippy.cornsilk.net
461afda9bb Fix build problem for when not compiled with debugging. 2006-09-06 17:10:58 -04:00
jimw@rama.(none)
d77d51a39f Merge rama.(none):/home/jimw/my/mysql-5.1-19874 
into  rama.(none):/home/jimw/my/mysql-5.1-clean
 2006-09-06 12:58:48 -07:00