mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38170 commits 2784 branches 343 tags 1.6 GiB
Commit graph

38170 commits

This branch
This branch
All branches
Author SHA1 Message Date
svoj@april.(none)
8dba18f742 After merge fix. 2006-09-12 21:38:57 +05:00
kaa@polly.local
6c0482b14a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
 2006-09-12 20:01:52 +04:00
andrey@example.com
2ef67ec2e5 ws fix 2006-09-12 17:48:26 +02:00
kaa@polly.local
6060b5bb50 Merge polly.local:/tmp/20924/bug20294/my50-bug20294 
into  polly.local:/home/kaa/src/maint/m50-maint--07OGt
 2006-09-12 19:35:44 +04:00
evgen@moonbone.local
9fb0340a34 item_cmpfunc.cc: 
Removed changes to the Item_func_between::fix_length_and_dec() made in the fix for bug#16377
query_cache.result:
  Corrected a test case after removing a fix for bug#16377
 2006-09-12 19:06:26 +04:00
timour/timka@lamia.home
f04c7546b6 Merge tkatchaounov@production:/data0/mysqldev/my/mysql-5.0-release 
into  lamia.home:/home/timka/mysql/src/5.0-bug-21774-sm
 2006-09-12 17:51:25 +03: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
kaa@polly.local
ca48b7af0c Merge polly.local:/tmp/20924/bug20294/my50-bug20294 
into  polly.local:/tmp/20924/bug20294/my51-bug20294
 2006-09-12 18:43:38 +04:00
mskold/marty@linux.site
b767f1a02c Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2006-09-12 16:35:41 +02:00
mskold/marty@mysql.com/linux.site
4f30db1f26 Bug #21378 Alter table from X storage engine to NDB could cause data loss: don't overwrite local tables when pushing out schema changes 2006-09-12 16:34:12 +02:00
kaa@polly.local
13331b8d24 Fixed compilation 2006-09-12 18:28:36 +04:00
mskold/marty@mysql.com/linux.site
bf52d20b4b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-09-12 16:24:39 +02:00
mskold/marty@mysql.com/linux.site
4bd1ef6b32 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
 2006-09-12 16:20:27 +02:00
msvensson@shellback.(none)
3cad5d196d Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-12 16:13:54 +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
mskold/marty@mysql.com/linux.site
125df80e9b Bug #21378 Alter table from X storage engine to NDB could cause data loss: Added warning if local table shadows ndb table 2006-09-12 16:04:52 +02:00
kaa@polly.local
e03faff3e4 Merge polly.local:/tmp/20924/bug20294/my41-bug20294 
into  polly.local:/tmp/20924/bug20294/my50-bug20294
 2006-09-12 17:57:15 +04:00
svoj@april.(none)
a59d7a2c78 Merge april.(none):/home/svoj/devel/bk/mysql-5.0-engines 
into  april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.0-push
 2006-09-12 18:53:51 +05:00
msvensson@shellback.(none)
df2fbc784d Bug#14862 undefined reference to `isinf' on SOLARIS - strings/strtod.c 
- Change the configure test looking for 'isinf' so the value returned from isinf is used. That avoids the call to isinf being optimized away.
 2006-09-12 15:47:48 +02:00
guilhem@gbichot3.local
a8836b7dde Fixing problems I identified in my auto_increment work pushed in July 
(as part of the auto_increment cleanup of WL#3146; let's not be
sad, that monster push still removed serious bugs):
one problem with INSERT DELAYED (unexpected interval releases),
one with stored functions (wrong auto_inc binlogging).
These bugs were not released.
 2006-09-12 15:42:13 +02:00
svoj@april.(none)
6e13c29717 Merge april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.0-engines 
into  april.(none):/home/svoj/devel/mysql/BUG20256/mysql-5.1-engines
 2006-09-12 18:42:10 +05: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
svoj@april.(none)
44f167ee1d BUG#20256 - LOCK WRITE - MyISAM 
Only MyISAM tables locked with LOCK TABLES ... WRITE were affected.

A query that is optimized with index_merge doesn't reflect rows
inserted within LOCK TABLES.

MyISAM doesn't flush a state within LOCK TABLES. index_merge
optimization creates a copy of the handler, which thus gets
outdated MyISAM state.

New handler->clone() method is introduced to fix this problem.
For non-MyISAM storage engines it allocates a handler and opens
it with ha_open(). For MyISAM it additionally copies MyISAM state
pointer to cloned handler.
 2006-09-12 18:25:35 +05: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
kaa@polly.local
5df7611caa Post-review fixes for bug #20924 2006-09-12 16:25:40 +04: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
istruewing@chilla.local
38886ffa2b Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug14400
 2006-09-12 11:40:24 +02:00
msvensson@shellback.(none)
e890eed69b Bug#22139 undefined reference to `my_memmem' when compiling tests/mysql_client_test 
- Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c
 2006-09-12 11:34:46 +02:00
msvensson@neptunus.(none)
e38f04a09f Merge neptunus.(none):/home/msvensson/mysql/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-12 11:23:07 +02:00
msvensson@neptunus.(none)
66bce61a88 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-12 11:14:09 +02:00
msvensson@shellback.(none)
9f2bdb23c2 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-12 10:23:29 +02:00
istruewing@chilla.local
17d5dee3ea Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug14400
 2006-09-12 09:00:41 +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
lars/lthalmann@mysql.com/dl145k.mysql.com
388b4df74e manual merge 2006-09-11 19:45:09 +02:00
lars/lthalmann@dl145k.mysql.com
a1c70022f2 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-11 17:14:40 +02:00
msvensson@shellback.(none)
461f08b794 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-09-11 16:44:10 +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)
d2cfc8d2a1 Merge bk-internal:/home/bk/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1
 2006-09-11 16:40:09 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
6ad198e997 Fix WARN_DEPRECATED for 5.0 (it is in 5.1 we should have the extra arguments) 2006-09-11 14:45:40 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
2da55c05e2 Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-11 13:50:41 +02:00
lars/lthalmann@dl145j.mysql.com
1dfc84986e Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
 2006-09-11 13:34:44 +02:00
lars/lthalmann@mysql.com/dl145j.mysql.com
4c467cc438 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl 
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
 2006-09-11 13:17:51 +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