database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity
28,684 Commits 3,346 Branches 1,099 Tags
bc4e6f822bf834ea241678632c9ef8ea13d11e9d
Commit Graph

28684 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jimw@mysql.com
bc4e6f822b Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-06 18:27:39 -08:00
jimw@mysql.com
642984d420 Fix innodb.result file (was missing a line) 2005-12-06 18:18:35 -08:00
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
jimw@mysql.com
5d701c2db5 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-06 12:29:30 -08: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
paul@kite-hub.kitebird.com
5cf9a20c9a mysqld.cc: 
Put options in order.
set_var.cc:
  Put system variables back in order.
 2005-12-06 13:21:29 -06: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
jimw@mysql.com
6ec4bcc664 Merge mysql.com:/home/jimw/my/mysql-5.1-bdb 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-06 10:57:55 -08:00
jimw@mysql.com
692a5ebbf9 Update BDB project file for Windows build 2005-12-06 09:54:28 -08:00
jimw@mysql.com
5dfc1fd5d8 Fix 'make dist' with new bundled BDB 2005-12-06 08:21:15 -08:00
ingo@production.mysql.com
f4cfef9049 Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  production.mysql.com:/usersnfs/istruewing/autopush/mysql-5.1-new
 2005-12-06 14:33:58 +01:00
pem@mysql.com
c6fc5d35cc Final review fix of #14233: Crash after tampering with the mysql.proc table. 
Changed variable type and added comment in sp.c.
 2005-12-06 14:25:12 +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
bar@mysql.com
fc19590b41 cp1250.xml: 
Index.xml:
  Adding Polish collation for cp1250.
 2005-12-06 16:19:50 +04:00
stewart@mysql.com
df48873089 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug15512
 2005-12-06 11:45:51 +01:00
stewart@mysql.com
d54c878f7b BUG#15512 crash during online add of API/SQL node 2005-12-06 11:25:53 +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
ingo@mysql.com
a588622a66 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug10932
 2005-12-06 08:19:23 +01:00
jimw@mysql.com
4f8b8e5027 Merge mysql.com:/home/jimw/my/mysql-5.1-14880 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-05 18:09:42 -08:00
jimw@mysql.com
074e15b7ab Merge mysql.com:/home/jimw/my/mysql-5.1-14671 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-12-05 18:07:48 -08:00
jimw@mysql.com
0c23407a63 Add missing BDB include file 2005-12-05 16:48:09 -08:00
jimw@mysql.com
d6264806b6 Remove generated BDB README file 2005-12-05 16:19:16 -08:00
jimw@mysql.com
786efa8332 Cleanup after import of BDB 2005-12-05 16:03:52 -08:00
patg@krsna.patg.net
bc5ee61f66 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new2
 2005-12-05 13:57:02 -08: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
jimw@mysql.com
af88d67a19 Import BDB 4.4.16 2005-12-05 10:27:46 -08:00
joerg@mysql.com
2eb0e9a43c Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1 2005-12-05 19:00:00 +01:00
joerg@mysql.com
b9451ee51f Merge from 4.1, partly manual. 2005-12-05 18:33:48 +01:00
knielsen@mysql.com
2713a7e15e Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2005-12-05 18:01:44 +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
joerg@mysql.com
7ce92291f0 Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this. 
(Backport of an identical change from 5.0)
 2005-12-05 17:53:42 +01:00
joerg@mysql.com
84db1b25a2 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2005-12-05 17:10:43 +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)
3ed00e8595 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-12-05 16:01:19 +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
knielsen@mysql.com
17cab43fcf Bug#15097: Missing \n in header printed by mysql --help when HAVE_READLINE 
is not defined.
 2005-12-05 12:12:08 +01: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
jani@a193-229-222-105.elisa-laajakaista.fi
c6d933c629 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-12-04 20:57:34 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
4f6a321bb8 Fixes multi_statement test case on NetWare. 2005-12-04 15:39:44 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
d88d8081da Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2005-12-04 15:34:47 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
669a12fdb0 A set of Netware related patches. 2005-12-04 15:02:06 +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
kent@mysql.com
9fd13ba93d my_global.h: 
Make __cxa_pure_virtual weak symbol
 2005-12-03 20:52:34 +01:00
kent@mysql.com
28fa86f45e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-12-03 14:40:24 +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