mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 07:14:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
29297 commits 2776 branches 343 tags 1.6 GiB
Commit graph

7680 commits

Author SHA1 Message Date
jimw@mysql.com
a910cfd663 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-06 18:15:18 -08:00
jimw@mysql.com
68bc3dd1fd Merge mysql.com:/home/jimw/my/mysql-5.0-14299 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-06 14:16:34 -08:00
konstantin@mysql.com
712385568f A fix and a test case for Bug#15392 "Server crashes during 
prepared statement execute
 2005-12-07 00:57:15 +03:00
serg@serg.mylan
eb5ccee783 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-12-06 22:31:09 +01:00
msvensson@neptunus.(none)
600a74b0d4 WL#2930 
- Updated after review
 2005-12-06 21:28:13 +01:00
aivanov@mysql.com
adc8051c71 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss52
 2005-12-06 23:15:21 +03:00
aivanov@mysql.com
9eee25472e Fix BUG#14747: "Race condition can cause btr_search_drop_page_hash_index() 
to crash".
 Changes from snapshot innodb-5.0-ss52.
 Note that buf_block_t::index should be protected by btr_search_latch
 or an s-latch or x-latch on the index page.
 btr_search_drop_page_hash_index(): Read block->index while holding
 btr_search_latch and use the cached value in the loop. Remove some
 redundant assertions.
 Also fix 13778. When FOREIGN_KEY_CHECKS=0 we still need to check that
 datatypes between foreign key references are compatible.
 Also added test cases to 9802.
 2005-12-06 22:02:40 +03:00
serg@serg.mylan
1aa775aa44 Merge 2005-12-06 18:21:46 +01:00
pem@mysql.com
a0ed1d5aba Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14233/mysql-5.0
 2005-12-06 13:34:18 +01:00
ingo@mysql.com
b5005d4171 Merge mysql.com:/home/mydev/mysql-5.0-bug10932 
into  mysql.com:/home/mydev/mysql-5.1-bug10932
 2005-12-06 08:31:38 +01:00
joerg@mysql.com
56e35734c2 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-12-05 20:42:44 +01:00
mleich@mysql.com
4024577205 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/matthias/Arbeit/mysql-5.0/src-Z
 2005-12-05 19:47:18 +01:00
serg@serg.mylan
6b5320d617 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-12-05 18:18:56 +01:00
mleich@mysql.com
2fd30b61d5 Fix for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs 
Solution according to the comments made by Guilhem
- rpl_relayrotate  Remove the SHOW SLAVE STATUS  It is not needed.
- rpl_until, rpl_deadlock Omit the printing of the "Slave_IO_Running" value
 2005-12-05 17:57:48 +01:00
patg@krsna.patg.net
ad594d3557 WORKLOG #2983 Removed --help from test. (did so already, don't know why 
push didn't push that previous changeset!)
 2005-12-05 07:50:16 -08:00
joerg@mysql.com
b5293c415f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-12-05 16:42:28 +01:00
msvensson@neptunus.(none)
0a45078dd8 Fix for mysqltest.test failing with mysql-test-run.pl and --ps-protocol 2005-12-05 16:00:23 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
a13220472f Disabled test. 2005-12-05 13:33:46 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
715becac5b Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-12-05 10:24:54 +02:00
patg@krsna.patg.net
2c2c812846 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-slap
 2005-12-03 17:17:07 -08:00
serg@serg.mylan
9c0a8bbd17 this has nothing to do with the bug#13012. 
it's about mysql_admin_commands not being reexecution-safe
(and CHECK still isn't)
 2005-12-03 15:02:09 +01:00
bell@sanja.is.com.ua
3d2d9c2259 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
 2005-12-03 08:56:00 +02:00
igor@rurik.mysql.com
09e6597015 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2005-12-02 20:42:36 -08:00
msvensson@devsrv-b.mysql.com
997f7027ae Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/my50-bug11731
 2005-12-02 23:37:38 +01:00
serg@serg.mylan
b3b72c6329 Bug#13012: REPAIR/BACKUP/RESTORE TABLE cause "packet out of order" in SP. 
Mark them properly as result-returning statements
 2005-12-02 22:59:45 +01:00
evgen@moonbone.local
e3103ad5d9 disabled.def: 
Failing tests func_group func_math group_min_max are disabled
 2005-12-03 00:52:41 +03:00
bell@sanja.is.com.ua
58c581ab62 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-02 22:59:29 +02:00
msvensson@devsrv-b.mysql.com
75bd92f1c6 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  devsrv-b.mysql.com:/space/magnus/my50-bug11731
 2005-12-02 21:06:35 +01:00
konstantin@mysql.com
6f63650d72 Add a test case for Bug#5967 "Stored procedure declared variable 
used instead of column", the bug is to be fixed later.
 2005-12-02 22:43:56 +03:00
bell@sanja.is.com.ua
b1f0e78146 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-02 21:20:25 +02:00
bell@sanja.is.com.ua
45e59f3d76 Now we shall store only position (index of first character) 
of SELECT from query begining, to be independet of query buffer
allocation.
Correct procedure used to find beginning of the current statement
during parsing (BUG#14885).
 2005-12-02 21:18:12 +02:00
evgen@moonbone.local
f2559fbcc3 Merge moonbone.local:/work/15028-bug-5.0-mysql 
into moonbone.local:/work/15028-bug-5.1-new-mysql
 2005-12-02 22:07:10 +03:00
bell@sanja.is.com.ua
54b7e6e3dc Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-02 20:50:54 +02:00
pem@mysql.com
e7a7af07b2 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/mysql-5.1-new
 2005-12-02 18:43:08 +01:00
msvensson@devsrv-b.mysql.com
17cc99470b Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug11731/my50-bug11731 
into  devsrv-b.mysql.com:/space/magnus/my50-bug11731
 2005-12-02 18:37:16 +01:00
msvensson@neptunus.(none)
c753df999c Bug #11731 mysqltest in multi-statement queries ignores errors in non-1st queries 
- Add tests to mysqltest.test
 - Problem no longer exists
 2005-12-02 18:29:15 +01:00
evgen@moonbone.local
00b902b065 Manually merged 2005-12-02 19:42:14 +03:00
evgen@moonbone.local
151350536c Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/15028-bug-4.1-mysql
 2005-12-02 18:42:05 +03:00
pem@mysql.com
035c24beeb Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug14376/mysql-5.0
 2005-12-02 15:04:50 +01:00
bell@sanja.is.com.ua
68a20f3ef7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-02 14:00:12 +02:00
ramil@mysql.com
681252c82d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/ram/work/5.0.b12956
 2005-12-02 11:57:26 +04:00
bell@sanja.is.com.ua
c98fbc0320 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
 2005-12-02 08:43:05 +02:00
elliot@mysql.com
36c45752e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/users/emurphy/src/mysql-5.1-new
 2005-12-02 06:16:24 +01:00
elliot@mysql.com
66a5dfa62f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/users/emurphy/src/mysql-5.1-new
 2005-12-02 01:23:26 +01:00
elliot@mysql.com
36936ecd64 BUG#15406: Adding support for transactions to blackhole. 
Now when rolling back a transaction on a blackhole table,
the transaction will not be written to the binlog.
 2005-12-02 01:11:49 +01:00
jimw@mysql.com
01ac5172dd Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-01 15:14:51 -08:00
SergeyV@selena.
29941c07ed Merge selena.:H:/MYSQL/bkt/mysql-5.0 
into  selena.:H:/MYSQL/bkt/mysql-5.1
 2005-12-01 23:47:44 +03:00
evgen@moonbone.local
3f72e7645f Fix bug#15028 Multitable update returns different numbers of matched rows 
depending on table order

multi_update::send_data() was counting updates, not updated rows. Thus if one 
record have several updates it will be counted several times in 'rows matched'
but updated only once.

multi_update::send_data() now counts only unique rows.
 2005-12-01 23:22:20 +03:00
jimw@mysql.com
beed6147ad Merge mysql.com:/home/jimw/my/mysql-4.1-13318 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-01 12:21:29 -08:00
jimw@mysql.com
fb1200a0a3 Merge mysql.com:/home/jimw/my/mysql-4.1-12612 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-12-01 12:07:25 -08:00