database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-22 17:44:29 +03:00
Code Activity
43,276 Commits 3,284 Branches 1,099 Tags
dc98aa82abeb14a491f05e583bd86110d319a10c
Commit Graph

16404 Commits

Author SHA1 Message Date
kaa@polly.local
e914eb690c Merge polly.local:/tmp/maint/bug6774/my51-bug6774 
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
 2007-01-24 17:34:31 +03:00
kaa@polly.local
c5a1c578f5 Merge polly.local:/tmp/maint/bug6774/my50-bug6774 
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
 2007-01-24 17:30:01 +03:00
kaa@polly.local
866ab1c205 Merge polly.local:/tmp/maint/bug6774/my50-bug6774 
into  polly.local:/tmp/maint/bug6774/my51-bug6774
 2007-01-24 17:12:42 +03:00
gkodinov/kgeorge@macbook.gmz
7fd3cd9e41 Merge bk-internal:/home/bk/mysql-5.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
 2007-01-24 15:57:58 +02:00
gkodinov/kgeorge@macbook.gmz
13238b0e3d merge of 5.0-opt -> 5.1-opt 2007-01-24 15:55:16 +02:00
kaa@polly.local
645de0c5d7 Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES" 2007-01-24 16:45:30 +03:00
istruewing@chilla.local
1417840cb9 Merge chilla.local:/home/mydev/mysql-5.0-bug24607 
into  chilla.local:/home/mydev/mysql-5.1-bug24607
 2007-01-24 13:32:36 +01:00
istruewing@chilla.local
23debf8662 Bug#24607 - MyISAM pointer size determined incorrectly 
After merge fix
 2007-01-24 13:29:46 +01:00
istruewing@chilla.local
050ddb2032 Merge chilla.local:/home/mydev/mysql-4.1-bug24607 
into  chilla.local:/home/mydev/mysql-5.0-bug24607
 2007-01-24 13:26:06 +01:00
istruewing@chilla.local
928d672c46 Bug#24607 - MyISAM pointer size determined incorrectly 
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.
 2007-01-24 13:17:01 +01:00
holyfoot/hf@mysql.com/hfmain.(none)
8190cfca85 bug #22682 Test fails --without-geometry 
geometry dependent parts moved to proper .test files
 2007-01-24 14:49:36 +04:00
df@kahlann.erinye.com
cb6c5f7ee7 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-24 09:24:52 +01:00
svoj@june.mysql.com
a6de0419d4 Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
 2007-01-24 11:56:18 +04:00
svoj@mysql.com/june.mysql.com
0e5aa80e8a After merge fix. 2007-01-24 11:53:09 +04:00
dlenev@mockturtle.local
a1376aa01b Fixed test case after merging fix for bug#24491 "using alias from source 
table in insert ... on duplicate key" in 5.1 tree.
 2007-01-24 10:46:25 +03:00
dlenev@mockturtle.local
282501df21 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg24491
 2007-01-24 10:42:57 +03:00
tomas@poseidon.mysql.com
f869a0d605 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
 2007-01-24 09:13:47 +07:00
igor@olga.mysql.com
459f3cf18a Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-01-23 17:04:01 -08:00
malff/marcsql@weblab.(none)
2bd3c8fdcc Bug#24392 (SHOW ENGINE MUTEX STATUS is a synonym for SHOW INNODB STATUS) 
Before this fix, the command SHOW ENGINE <name> STATUS would:
- print a warning if the engine name is unknown,
- proceed and implement the same behavior as SHOW ENGINE ALL STATUS,
and list the status of all the storage engines registered.

In particular, this behavior caused confusion about the command :
SHOW ENGINE MUTEX STATUS, which as a side effect would print the status
of the innodb engine when that engine is registered.

Also, before this fix, every time an unknown engine name was substituted by
the default engine (which happen unless SQL_MODE NO_ENGINE_SUBSTITUTION is
set), a malformed warning was raised.
For example, the command ALTER TABLE T1 ENGINE = X would print :
Warnings:
Error 1286 Unknown table engine 'X'

With this fix:
SHOW ENGINE <name> STATUS|LOGS|MUTEX
always fails with an error when the engine <name> is unknown.

For other commands, warnings about unknown engines are raised as:
Warnings:
Warning 1286 Unknown table engine 'X'

In other words, engine substitution never affect the SHOW ENGINE command,
since this would lead to very confusing results.
 2007-01-23 15:14:08 -07:00
istruewing@chilla.local
26153490ec Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug24607
 2007-01-23 22:27:03 +01:00
mjorgensen@production.mysql.com
2e174533f0 Merge bk-internal:/home/bk/mysql-5.1 
into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build
 2007-01-23 20:38:00 +01:00
istruewing@chilla.local
b381fd87bb Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-bug24607
 2007-01-23 20:19:19 +01:00
igor@olga.mysql.com
20279c1a7b Post-merge fix. 2007-01-23 10:11:53 -08:00
igor@olga.mysql.com
ed3c1741d4 Merge olga.mysql.com:/home/igor/mysql-4.1-opt 
into  olga.mysql.com:/home/igor/mysql-5.0-opt
 2007-01-23 09:56:06 -08:00
gkodinov/kgeorge@rakia.gmz
ac25a49ff4 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B6172-5.1-opt
 2007-01-23 19:48:53 +02:00
gkodinov/kgeorge@macbook.gmz
450e9b6b30 Bug #6172: RAND(a) should only accept constant values as arguments 
RAND() must accept scalar expressions regardless of their kind.
 That includes both constant expressions and expressions that 
 depend on column values.
 When the expression is constant the random seed can be initialized
 at compile time.
 However when the expression is not constant the random seed must be
 initialized at each invocation (while it still can be allocated at
 compile time).
 Implemented the above rules by extending Item_func_rand::val_real()
 to initialize the random seed at the correct place.
 2007-01-23 19:45:58 +02:00
dlenev@mockturtle.local
6562df201a Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg24491
 2007-01-23 15:57:46 +03:00
dlenev@mockturtle.local
2b63f10601 Proposed fix for bug#24491 "using alias from source table in insert ... 
on duplicate key".

INSERT ... SELECT ... ON DUPLICATE KEY UPDATE which was used in
stored routine or as prepared statement and which in its ON DUPLICATE
KEY clause erroneously tried to assign value to a column mentioned only
in its SELECT part was properly emitting error on the first execution
but succeeded on the second and following executions.

Code which is responsible for name resolution of fields mentioned in
UPDATE clause (e.g. see select_insert::prepare()) modifies table list
and Name_resolution_context used in this process. It uses
Name_resolution_context_state::save_state/restore_state() to revert
these modifications. Unfortunately those two methods failed to revert
properly modifications to TABLE_LIST::next_name_resolution_table
and this broke name resolution process for successive executions.

This patch fixes Name_resolution_context_state::save_state/restore_state()
in such way that it properly handles TABLE_LIST::next_name_resolution_table.
 2007-01-23 15:03:48 +03:00
gkodinov/kgeorge@macbook.gmz
17a0207ece Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
 2007-01-23 12:34:50 +02:00
istruewing@chilla.local
786063e30c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines 
into  chilla.local:/home/mydev/mysql-5.1-bug24607
 2007-01-23 11:09:58 +01:00
gluh@mysql.com/eagle.(none)
e34b0056f2 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
 2007-01-23 14:08:58 +04:00
joerg@trift2.
e40ce2e081 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-01-23 11:05:44 +01:00
tomas@poseidon.mysql.com
a9193743a2 correct manual merge 2007-01-23 09:52:13 +07:00
tsmith@quadxeon.mysql.com
ac07828bc4 Merge bk://localhost:5556 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-01-23 02:30:48 +01:00
tomas@poseidon.mysql.com
cd5f9b2f3e Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-01-23 07:25:24 +07:00
monty@mysql.com/narttu.mysql.fi
243a3a06e9 Change to new (after merge) error numbers 2007-01-23 01:58:07 +02:00
igor@olga.mysql.com
9659c11b6e Fixed bug #25637: LEFT JOIN with BOOLEAN FULLTEXT loses left table matches. 
The bug is actually a duplicate of the bug 14708.
Down-ported the fix for 14708 from 5.0.  
Merged the test case for bug 14708 from 5.0.
 2007-01-22 14:23:53 -08:00
jonas@perch.ndb.mysql.com
6fae8d4133 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-01-22 22:25:56 +01:00
tomas@poseidon.mysql.com
9605aee4fe bug#25746 ndb: 4209 error with 2 VARCHAR primary keys 
- make sure keys are copied correctly when varchar has 2 length bytes
- test case
 2007-01-23 00:34:00 +07:00
monty@narttu.mysql.fi
7df1dbcd74 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-01-22 19:18:22 +02:00
anozdrin/alik@alik.
ddffdd1c74 Enabling im_daemon_life_cycle.imtest in team tree. 
Do not propagate this change into main trees.
 2007-01-22 20:00:27 +03:00
anozdrin/alik@alik.
4c4b58a17b Enabling im_daemon_life_cycle.imtest in team tree in order to debug IM. 
Do not propagate this change into main trees!
 2007-01-22 19:50:34 +03:00
monty@mysql.com/narttu.mysql.fi
2dcc7110c9 Give warnings for unused objects 
Changed error message to be compatible with old error file
Added new error message for new DUP_ENTRY syntax
 2007-01-22 18:42:52 +02:00
msvensson@neptunus.(none)
f8623dc703 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-01-22 17:10:24 +01:00
msvensson@neptunus.(none)
cff8f55088 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-01-22 16:58:21 +01:00
df@kahlann.erinye.com
224ce90806 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
 2007-01-22 16:41:11 +01:00
df@kahlann.erinye.com
c5de0332e1 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-22 16:39:40 +01:00
df@kahlann.erinye.com
c124372550 after-merge fix 2007-01-22 16:32:57 +01:00
df@kahlann.erinye.com
58bf072264 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2007-01-22 16:30:53 +01:00
monty@mysql.com/narttu.mysql.fi
807526ff79 Fixed compiler warnings 
Fixed wrong merge that disabled 'make test'
Renamed all suppress files to end in '.supp'
Don't give "skipped %d bytes from file" warnings in 5.0
 2007-01-22 15:52:15 +02:00