database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity
37,598 Commits 3,279 Branches 1,097 Tags
d77d51a39f01c5df13695989b2244f0a3d403691
Commit Graph

13691 Commits

Author SHA1 Message Date
pekka@mysql.com
da807a85b9 Merge mysql.com:/space/pekka/ndb/version/my50 
into  mysql.com:/space/pekka/ndb/version/my50-bug14509
 2006-05-25 13:08:50 +02:00
pekka@mysql.com
7fcc77f49c ndb - bug#14509 v5.1 part 2/2 : handler level 2006-05-25 12:13:47 +02:00
gkodinov@mysql.com
0336a34c7f Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kgeorge/mysql/5.0/clean
 2006-05-25 13:12:57 +03:00
gkodinov@mysql.com
d50fcc8644 Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B18742-2
 2006-05-25 12:21:42 +03:00
grog@mysql.com
1f86b3f100 BUG#17201: Improve handling of views. 2006-05-25 17:30:28 +09:30
gkodinov@mysql.com
bda18671a1 Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B18742-2
 2006-05-25 10:45:24 +03:00
gkodinov@mysql.com
486837b0fa Merge mysql.com:/home/kgeorge/mysql/5.0/clean 
into  mysql.com:/home/kgeorge/mysql/5.0/B19700
 2006-05-25 10:45:00 +03:00
gkodinov@mysql.com
d6b5a89044 Bug #19700: subselect returning BIGINT always returned it as SIGNED 
The unsigned flag in Item was not propagated through the single value subqueries.
This caused the result to be treated as signed.
 2006-05-25 10:39:18 +03: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
ba75d18bec Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17455 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19304
 2006-05-24 13:56:23 -04:00
reggie@big_geek.
c492b58920 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-kt 
into  big_geek.:D:/work/mysql/mysql-5.1-vc71
 2006-05-24 12:46:45 -05: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
aelkin@dl145h.mysql.com
ac158d52b9 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  dl145h.mysql.com:/tmp/andrei/4.1-bug14157-utf8_binlog_testcases
 2006-05-24 16:55:04 +02:00
monty@mysql.com
4064f11acf Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-24 17:33:12 +03:00
monty@mysql.com
7cb3df0114 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-24 17:32:17 +03:00
monty@mysql.com
9e9ca8b6eb More DBUG statements 
Replaced COND_refresh with COND_global_read_lock becasue of a bug in NTPL threads when using different mutexes as arguments to pthread_cond_wait()
The original code caused a hang in FLUSH TABLES WITH READ LOCK in some circumstances because pthread_cond_broadcast() was not delivered to other threads.
This fixes:
Bug#16986: Deadlock condition with MyISAM tables
Bug#20048: FLUSH TABLES WITH READ LOCK causes a deadlock
 2006-05-24 17:21:35 +03:00
svoj@april.(none)
99b1d746b3 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
 2006-05-24 18:42:18 +05:00
reggie@big_geek.
86787fb3b8 mtr_misc.pl: 
Fix mtr_exe_exists to work on win32
 2006-05-24 08:32:08 -05:00
rburnett@bk-internal.mysql.com
9138f0ba6e Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-24 14:57:44 +02:00
serg@mysql.com
c6abfd2f7f Merge mysql.com:/data0/mysqldev/my/mysql-5.0.22-release 
into  mysql.com:/data0/mysqldev/my/mysql-5.1-release
 2006-05-24 14:37:18 +02:00
serg@mysql.com
c00edb8e8a Merge mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release 
into  mysql.com:/data0/mysqldev/my/mysql-5.0.22-release
 2006-05-24 14:22:36 +02:00
serg@mysql.com
44ec4456b8 Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release 
into  mysql.com:/data0/mysqldev/my/mysql-4.1.20-release
 2006-05-24 14:12:19 +02:00
konstantin@mysql.com
9e635c7bfe Merge mysql.com:/opt/local/work/mysql-5.0-root 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-05-24 14:54:35 +04:00
svoj@april.(none)
73ae726d60 Merge april.(none):/home/svoj/devel/mysql/BUG12873/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG17001/mysql-5.0
 2006-05-24 15:19:48 +05:00
serg@mysql.com
1841c44cfc Merge mysql.com:/data0/mysqldev/my/mysql-4.1.16a-release 
into  mysql.com:/data0/mysqldev/my/mysql-5.0.17c-release
 2006-05-24 12:19:39 +02:00
holyfoot@deer.(none)
8485c574d9 bug #19650 (Embedded crashes in 5.1.10) 2006-05-24 13:28:24 +05:00
msvensson@neptunus.(none)
dcf9810cb1 Merge neptunus.(none):/home/msvensson/mysql/bug15328/my41-bug15328 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-05-24 10:16:31 +02: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
msvensson@shellback.(none)
a4461b350c Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-05-24 08:26:17 +02:00
svoj@april.(none)
fb27799a86 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
 2006-05-24 10:47:09 +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
kent@mysql.com
97674810b0 don't let bugfix for bug#8303 break the bugfix for bug#8378 
revert the fix for bug#8303
correct the test for bug#8378
 2006-05-24 00:55:53 +02:00
serg@serg.mylan
ccf46315a2 merged 2006-05-23 21:46:57 +02:00
rburnett@bk-internal.mysql.com
37d1e803f1 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
 2006-05-23 20:28:52 +02: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
serg@serg.mylan
cce88f7a5b don't let bugfix for bug#8303 break the bugfix for bug#8378 
revert the fix for bug#8303
correct the test for bug#8378
 2006-05-23 19:36:06 +02: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
msvensson@neptunus.(none)
0f1ae1305d Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-05-23 17:05:37 +02:00
msvensson@shellback.(none)
1e21055db5 Updated after review 2006-05-23 15:59:52 +02:00
msvensson@neptunus.(none)
9580c05ccc Make wait_timeout test not timing dependent 2006-05-23 15:45:16 +02:00
gkodinov@mysql.com
d81a8437e4 Bug #18742: Test 'group_min_max' fails if "classic" configuration in 5.0 
Moved the InnoDB related tests to innodb_mysql
 2006-05-23 16:43:01 +03:00
msvensson@shellback.(none)
1c65a2d8d9 Add loop to wait for servers to start before continuing with test 
Remove workarounds for "hang in select"
 2006-05-23 15:27:56 +02:00
msvensson@shellback.(none)
1cf3b0d3bf Use mtr_kill_process from mtr_kill_processes 
Change to use 0.1 second sleep between kill attempt
 2006-05-23 15:25:17 +02: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
svoj@april.(none)
59302e5540 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG18233/mysql-5.0
 2006-05-23 17:30:55 +05:00
andrey@lmy004.
9670bb6ae4 Merge lmy004.:/work/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release-17619-try3
 2006-05-23 13:49:24 +02:00