mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34407 commits 2774 branches 343 tags 1.6 GiB
Commit graph

9607 commits

Author SHA1 Message Date
gluh@mysql.com
023317d68a after merge fix 2006-05-25 19:20:34 +05:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
7f6afa8b2a Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
 2006-05-25 10:20:33 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
a95f31bd4e manual merge 2006-05-24 13:57:21 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
d1098a85eb Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
 2006-05-24 13:41:04 -04:00
evgen@moonbone.local
516b8f0aca Manually merged 2006-05-24 20:52:57 +04:00
svoj@april.(none)
13ae6420fd Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
 2006-05-24 12:34:24 +05:00
svoj@april.(none)
578743cd7d Merge april.(none):/home/svoj/devel/BitKeeper/mysql-5.1-new 
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
 2006-05-24 12:31:39 +05:00
brian@zim.(none)
5d9ec1ee82 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-23 19:08:28 -07:00
jimw@mysql.com
dd81642594 Fix events_logs_tests so it won't fail on Windows due to appearance 
of hostname in query results.
 2006-05-23 17:51:17 -07:00
brian@zim.(none)
b514d3a89c Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-23 11:25:11 -07:00
jimw@mysql.com
d2132bc04a Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-23 09:49:04 -07:00
andrey@lmy004.
fd2792cbe4 Merge lmy004.:/work/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release-17619-try3
 2006-05-23 15:07:08 +02:00
andrey@lmy004.
fb42ce5fd7 update log_tables.test so it is less fragile 2006-05-23 15:01:23 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
0bd08dd4b6 BUG#19304: Merge handler allowed in partitioned tables 2006-05-23 07:37:03 -04:00
andrey@lmy004.
c04a800f3d Merge lmy004.:/work/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release-17619-try3
 2006-05-23 12:13:02 +02:00
andrey@lmy004.
f234eef13b update result 
drop users at the end of events_stress
 2006-05-23 12:10:07 +02:00
andrey@lmy004.
60b75a3a02 make it less stressful. some pushbuild boxes cannot cope with it 2006-05-23 10:49:09 +02:00
gluh@eagle.intranet.mysql.r18.ru
474ef8ed43 Fix for bug#17626 CREATE TABLE ... SELECT failure with TRADITIONAL SQL mode 
transfer NO_DEFAULT_VALUE_FLAG flag to new field
 2006-05-23 13:27:45 +05:00
anozdrin@mysql.com
f0a01456e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
 2006-05-23 12:08:47 +04:00
gluh@eagle.intranet.mysql.r18.ru
457aea43fc Bug#16681 information_schema shows forbidden VIEW details 
show view definition to users that have the needed privilleges
 2006-05-23 12:45:25 +05:00
jimw@mysql.com
26d6e5651d Merge mysql.com:/home/jimw/my/mysql-5.1-20004 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-22 13:21:50 -07:00
andrey@lmy004.
3ced49d2f6 manual merged 2006-05-22 21:57:23 +02:00
igor@rurik.mysql.com
4a673444f7 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-05-22 12:55:28 -07:00
andrey@lmy004.
b429d73d62 fix for bug #17619 Scheduler race conditions 
- Scheduler is either initialized at server start or never.
  Starting & stopping is now suspending & resuming.
- The scheduler has clear OO interface
- Now all calls to the scheduler are synchronous
- GLOBAL event_scheduler uses thd::sys_var_tmp (see set_var.cc)
- External API is encapsulated into class Events
- Includes fixes for all comments of Kostja's review of 19.05.2005

Starting to merge into 5.1-release (5.1.10) and push
 2006-05-22 20:46:13 +02:00
brian@zim.(none)
f99ce7ad62 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-22 11:40:29 -07:00
jimw@mysql.com
a995439b12 Bug #20004: log_tables fails on Windows due to output differences 
This test included hostname information in the output, which varies
  between platforms.
 2006-05-22 11:34:41 -07:00
gkodinov@mysql.com
b2494b8174 Merge mysql.com:/home/kgeorge/mysql/5.0/B18745 
into  mysql.com:/home/kgeorge/mysql/5.1/B18745
 2006-05-22 18:15:47 +03:00
gkodinov@mysql.com
b357c232fc Bug#18745: Test case 'func_group' fails if "classic" 5.0 configuration 
Moved the InnoDB related test from func_group.test to innodb_mysql.test
 2006-05-22 16:10:53 +03:00
anozdrin@mysql.com
4a43bd1a3a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
 2006-05-22 14:22:58 +04:00
pekka@mysql.com
641c92dd62 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my51
 2006-05-21 21:58:00 +02:00
holyfoot@mysql.com
b9cd71e622 Merge bk@192.168.21.1:mysql-5.0 
into mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-05-21 18:22:13 +05:00
pekka@mysql.com
1a519e2971 ndb - bug#19956 (occurs only in v5.0) 2006-05-21 11:04:57 +02:00
igor@rurik.mysql.com
4a27cbfd02 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-05-20 19:10:43 -07:00
igor@rurik.mysql.com
12e53358f0 Fixed bug #19089. 
When a CREATE TABLE command created a table from a materialized
view id does not inherit default values from the underlying table.
Moreover the temporary table used for the view materialization
does not inherit those default values.
In the case when the underlying table contained ENUM fields it caused
misleading error messages. In other cases the created table contained
wrong default values.
The code was modified to ensure inheritance of default values for
materialized views.
 2006-05-20 18:54:43 -07:00
jimw@mysql.com
8262c3c38e Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2006-05-19 19:07:33 -07:00
jimw@mysql.com
2b13192c2e Merge mysql.com:/home/jimw/my/mysql-5.0-1039 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-05-19 16:17:24 -07:00
tomas@poseidon.ndb.mysql.com
00188154c9 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2006-05-19 23:20:33 +02:00
sergefp@mysql.com
49e23937e4 Merge mysql.com:/home/psergey/tmp_merge 
into  mysql.com:/home/psergey/mysql-5.1-merge
 2006-05-19 16:00:29 +04:00
tomas@poseidon.ndb.mysql.com
d0fd5ecde8 Bug #19395 mysqld does not always detect cluster shutdown 
Bug #17610 ndbapi: dropEventOperation leaves object behind, memleak
 2006-05-18 23:38:07 +02:00
igor@rurik.mysql.com
710d422404 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-05-18 13:17:59 -07:00
lars@mysql.com
399a1b845b After merge fixes 2006-05-18 21:40:52 +02:00
igor@rurik.mysql.com
3b3e6ecb95 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-2
 2006-05-18 11:30:42 -07:00
brian@zim.(none)
f373c81ac8 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-05-18 11:23:21 -07:00
jimw@mysql.com
7d54b004a2 Bug #13975: "same string" + 0 has 2 different results 
The 'decimals' member of Item_func was being improperly initialized,
  which resulted in improper results when handling large numeric values.
 2006-05-18 10:34:01 -07:00
lars@mysql.com
87bb4f95ea Merge mysql.com:/users/lthalmann/bkroot/tmp_5.0_merge 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-05-18 18:38:50 +02:00
anozdrin@mysql.com
c1113af15c This is an implementation of two WL items: 
- WL#3158: IM: Instance configuration extensions;
  - WL#3159: IM: --bootstrap and --start-default-instance modes

The following new statements have been added:
  - CREATE INSTANCE;
  - DROP INSTANCE;

The behaviour of the following statements have been changed:
  - SET;
  - UNSET;
  - FLUSH INSTANCES;
  - SHOW INSTANCES;
  - SHOW INSTANCE OPTIONS;
 2006-05-18 18:57:50 +04:00
svoj@april.(none)
9836600b70 Merge april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.1
 2006-05-18 18:49:52 +05:00
evgen@moonbone.local
894092becf Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/19077-bug-5.0-mysql
 2006-05-18 16:01:13 +04:00
knielsen@mysql.com
339afc620f After-merge fix. 2006-05-18 13:35:15 +02:00
svoj@april.(none)
da1fdb8a5f Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
 2006-05-18 16:13:32 +05:00