mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34701 commits 2784 branches 343 tags 1.6 GiB
Commit graph

34701 commits

This branch
This branch
All branches
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
ramil@mysql.com
bbb991e597 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/ram/work/4.1.b16900
 2006-05-25 16:05:55 +05:00
serg@serg.mylan
9874a76252 fix for BSD make 2006-05-25 12:48:31 +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
pekka@mysql.com
577246509f ndb - bug#14509 v5.1 part 1/2 : ndb api level [requires part 2/2] 2006-05-25 12:03:02 +02: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
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
reggie@big_geek.
e056a96a29 The previous patch fixed the csv engine to support dos, linux, and mac line endings. The patch, however, had 
a problem when the table only has a single record in it.  This patch corrects that.

ha_tina.cc:
  Fix problem with previous patch when there is only one record in the table
 2006-05-24 15:41:12 -05:00
evgen@moonbone.local
d7e831ac62 sql_select.cc: 
After merge fix
 2006-05-25 00:03:35 +04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
701007fe30 review fix 2006-05-24 15:01:03 -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
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
reggie@big_geek.
4a25f024ee some small fixups 2006-05-24 12:43:03 -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
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
cb0a4f7423 BUG#19304: Merge handler not part of partitioned tables 
Review fix
 2006-05-24 13:35:52 -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
svoj@april.(none)
551043b3df 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 16:59:27 +05: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
ramil@production.mysql.com
cc1dc76c66 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
 2006-05-24 12:31:49 +02:00
kent@mysql.com
7ffc786686 configure.in: 
Update NDB version as well
 2006-05-24 12:30:34 +02:00
kent@mysql.com
22a52ede3f configure.in: 
Stepped up to 5.0.23
 2006-05-24 12:28:34 +02:00
kent@mysql.com
eb627531f3 configure.in: 
Stepped up to 4.1.22
 2006-05-24 12:20:17 +02: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
svoj@april.(none)
0674c702b0 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 15:13:49 +05:00
kent@mysql.com
0b10712033 configure.in: 
Changed version to 5.0.22
 2006-05-24 11:33:17 +02:00
monty@mysql.com
2a2da2f09b Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-05-24 12:09:16 +03:00
mskold@mysql.com
94d21618c1 Bug #16997 Table rename that changes database does not rename indexes: merge 2006-05-24 10:58:12 +02:00
monty@mysql.com
97b941d924 Remove dflt_field from field structure as this was only needed when createing temporary table and I found another soultion that doesn't increase the size of the field structure for all table instances. (Better fix for bug #19089) 
Fixed compiler warnings
Fixed valgrind warning in Item_date_add_intervall::eq. (Recoding of bugfix #19490)
 2006-05-24 11:56:59 +03: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
ramil@production.mysql.com
31eadde21a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  production.mysql.com:/usersnfs/rkalimullin/4.1.b18351
 2006-05-24 10:08:26 +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
knielsen@mysql.com
b03168eb2f Fix missing source file. 2006-05-24 09:28:37 +02:00
knielsen@mysql.com
fb1e5cee46 Merge mysql.com:/usr/local/mysql/mysql-5.0-gcov 
into  mysql.com:/usr/local/mysql/mysql-5.1-new
 2006-05-24 09:23:45 +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