mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37194 commits 2793 branches 343 tags 1.7 GiB
Commit graph

10811 commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
365b69dc7f Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-29 22:56:23 +02:00
timour/timka@lamia.home
0368914b9a Merge lamia.home:/home/timka/mysql/src/5.0-bug-21456 
into  lamia.home:/home/timka/mysql/src/5.1-bug-21456
 2006-08-29 16:39:09 +03:00
jonas@perch.ndb.mysql.com
e4c3a58134 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-25 11:59:28 +02:00
jonas@perch.ndb.mysql.com
c6e8be9808 ndb - bug#21806 
disable ndb_autodiscover3 (cluster restart (--initial))
 2006-08-25 08:57:38 +02:00
jonas@perch.ndb.mysql.com
a7513025c4 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-24 20:31:54 +02:00
jonas@perch.ndb.mysql.com
392b7ea14b ndb - 
disable ndb_binlog_discover as it's broken
  remove debug printout
 2006-08-24 20:31:12 +02:00
petr/cps@owlet.local
257ce16d58 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
 2006-08-24 16:18:58 +04:00
petr/cps@mysql.com/owlet.local
e36be72adb after merge fix 2006-08-24 16:17:42 +04:00
timour/timka@lamia.home
70f76e457f Merge lamia.home:/home/timka/mysql/src/4.1-bug-21456 
into  lamia.home:/home/timka/mysql/src/5.0-bug-21456
 2006-08-23 18:22:53 +03:00
andrey@example.com
f41f9bf0d9 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  example.com:/work/mysql-5.1-runtime
 2006-08-23 15:51:37 +02:00
andrey@example.com
9c8c1817ce Fix for bug #20665 All commands supported in Stored Procedures 
should work in Prepared Statements. Post-review changeset.

Problem: There are some commands which are avaiable to be executed in SP
         but cannot be prepared. This patch fixes this and makes it possible
         prepare these statements.

Changes: The commands later are made available in PS. RESET has been forbidden
         in SF/Trigger.

Solution: All current server commands where checked and those missing (see later)
          we added. Tests for all of the commands with repeated executions were
          added - testing with SP, SF and PS.

SHOW BINLOG EVENTS
SHOW (MASTER | SLAVE) STATUS
SHOW (MASTER | BINARY) LOGS
SHOW (PROCEDURE | FUNCTION) CODE (parsable only in debug builds)
SHOW CREATE (PROCEDURE | FUNCTION | EVENT | TABLE | VIEW)
SHOW (AUTHORS | CONTRIBUTORS | WARNINGS | ERRORS)
CHANGE MASTER
RESET (MASTER | SLAVE | QUERY CACHE)
SLAVE (START | STOP)
CHECKSUM (TABLE | TABLES)
INSTALL PLUGIN
UNINSTALL PLUGIN
CACHE INDEX
LOAD INDEX INTO CACHE
GRANT
REVOKE
KILL
(CREATE | RENAME | DROP) DATABASE
(CREATE | RENAME | DROP) USER
FLUSH (TABLE | TABLES | TABLES WITH READ LOCK | HOSTS | PRIVILEGES |
       LOGS | STATUS | MASTER | SLAVE | DES_KEY_FILE | USER_RESOURCES)
 2006-08-23 15:50:06 +02:00
timour/timka@lamia.home
de723f2998 Bug #21456: SELECT DISTINCT(x) produces incorrect results when using order by 
GROUP BY/DISTINCT pruning optimization must be done before ORDER BY 
optimization because ORDER BY may be removed when GROUP BY/DISTINCT
sorts as a side effect, e.g. in 
  SELECT DISTINCT <non-key-col>,<pk> FROM t1
  ORDER BY <non-key-col> DISTINCT
must be removed before ORDER BY as if done the other way around
it will remove both.
 2006-08-23 16:46:57 +03:00
petr/cps@owlet.local
5fae48d9e4 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
 2006-08-23 17:15:24 +04:00
petr/cps@owlet.local
2763504be4 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/cps/mysql/trees/mysql-5.1-virgin
 2006-08-23 16:48:39 +04:00
pekka@orca.ndb.mysql.com
26e5b93203 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-08-22 14:19:10 +02:00
jonas@perch.ndb.mysql.com
5067c4214b Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-22 12:42:56 +02:00
jonas@perch.ndb.mysql.com
770c2edcdd ndb - reenable "random" failing test 2006-08-22 12:41:24 +02:00
jonas@perch.ndb.mysql.com
2ae18a6be4 ndb - 
add another possible ok error in testcase
 2006-08-22 11:55:25 +02:00
pekka@orca.ndb.mysql.com
b97a4b7f44 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
 2006-08-22 10:24:58 +02:00
jonas@perch.ndb.mysql.com
a1ea21bf26 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-22 09:49:28 +02:00
jonas@perch.ndb.mysql.com
66801f44f9 ndb - 
reenable some test after adding sync_with_master to end of test
    to make sure that binlog has been applied to slave before end of test
 2006-08-22 09:48:15 +02:00
cmiller@zippy.cornsilk.net
d170f1b124 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-21 16:59:53 -04:00
cmiller@zippy.cornsilk.net
f2f90320de Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-21 12:59:46 -04:00
cmiller@zippy.cornsilk.net
ff57b304a4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1
 2006-08-21 12:55:43 -04:00
dlenev@mockturtle.local
a486f95547 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21216-2 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg19403-2
 2006-08-21 12:28:35 +04:00
dlenev@mockturtle.local
186fa6c291 Fix for bug#21216 "Simultaneous DROP TABLE and SHOW OPEN TABLES causes 
server to crash".

Crash caused by assertion failure happened when one ran SHOW OPEN TABLES
while concurrently doing DROP TABLE (or RENAME TABLE, CREATE TABLE LIKE
or any other command that takes name-lock) in other connection.
For non-debug version of server problem exposed itself as wrong output
of SHOW OPEN TABLES statement (it was missing name-locked tables).
Finally in 5.1 both debug and non-debug versions simply crashed in
this situation due to NULL-pointer dereference.

This problem was caused by the fact that table placeholders which were
added to table cache in order to obtain name-lock had TABLE_SHARE::table_name
set to 0. Therefore they broke assumption that this member is non-0 for
all tables in table cache which was checked by assert in list_open_tables()
(in 5.1 this function simply relies on it).
The fix simply sets this member for such placeholders to appropriate value
making this assumption true again.

This patch also includes test for similar bug 12212 "Crash that happens
during removing of database name from cache" reappeared in 5.1 as bug 19403.
 2006-08-21 12:18:59 +04:00
jonas@perch.ndb.mysql.com
21bfd9849b ndb - revert timeout changes, as a test depends on it, it mysterious ways 
(mysql-test-run only)
 2006-08-21 07:53:27 +02:00
petr/cps@mysql.com/owlet
30ef47a93c Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
 2006-08-18 16:48:32 +04:00
rburnett@bk-internal.mysql.com
4b7e3775be Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-17 22:30:32 +02:00
jonas@perch.ndb.mysql.com
40754dd6e3 ndb - rpl_ndb_basic 
fix for change of deadlock timeout in config.ini
 2006-08-17 20:59:42 +02:00
jonas@perch.ndb.mysql.com
560fc3e3b3 Merge perch.ndb.mysql.com:/home/jonas/src/51-clean 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-08-17 19:49:00 +02:00
rburnett@bk-internal.mysql.com
d65095b451 Merge bk-internal.mysql.com:/data0/bk/tmp_reg 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1
 2006-08-17 17:19:41 +02:00
cmiller@zippy.cornsilk.net
64092ca93b Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:55:57 -04:00
cmiller@zippy.cornsilk.net
030ddb48f3 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:47:23 -04:00
cmiller@zippy.cornsilk.net
c627a6ce84 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
 2006-08-17 10:42:50 -04:00
rburnett@bk-internal.mysql.com
1bfe766869 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-17 16:37:16 +02:00
iggy@rolltop.ignatz42.dyndns.org
00ab7be7b9 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-merge
 2006-08-16 19:31:33 -04:00
iggy@rolltop.ignatz42.dyndns.org
ca6532af50 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_20328
 2006-08-16 16:16:10 -04:00
iggy@rolltop.ignatz42.dyndns.org
a86f035a08 Bug#20328 - Correction to test/result for broken Windows build. 2006-08-16 13:55:16 -04:00
pgalbraith/patg@govinda.patg.net
370f22418b merge 5.0 -> 5.1, re-enabling federated, disabled partition 2006-08-16 10:47:53 -07:00
patg@govinda.patg.net
b56ff54805 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
 2006-08-16 10:05:24 -07:00
patg@govinda.patg.net
79ad722e39 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-clean2
 2006-08-16 10:03:24 -07:00
msvensson@shellback.(none)
da60a5194c Merge shellback.(none):/home/msvensson/mysql/bug20328/my50-bug20328 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-16 17:14:40 +02:00
msvensson@shellback.(none)
98eaa07600 Bug#20328 mysql client: dumb about trailing spaces on 'help' command 
Fix testcase to also work on windows
 2006-08-16 17:03:41 +02:00
rburnett@bk-internal.mysql.com
8baecf7ed6 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
 2006-08-16 16:04:10 +02:00
rburnett@bk-internal.mysql.com
f23643cc54 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-08-16 15:58:25 +02:00
msvensson@shellback.(none)
b963293595 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-16 15:50:50 +02:00
holyfoot/hf@mysql.com/deer.(none)
c965eea789 Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.20910
 2006-08-16 09:57:05 +05:00
ramil/rkalimullin@production.mysql.com
4ef5116425 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  production.mysql.com:/usersnfs/rkalimullin/mysql-5.0
 2006-08-16 06:37:39 +02:00
brian@zim.(none)
8d83366bac Merge zim.(none):/home/brian/mysql/dep-5.1 
into  zim.(none):/home/brian/mysql/remove-bdb-5.1
 2006-08-15 13:53:13 -07:00