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

23915 commits

This branch
This branch
All branches
Author SHA1 Message Date
igor@igor-inspiron.creware.com
785fca1162 Manual merge 2005-06-13 11:45:29 -07:00
tulin@dl145c.mysql.com
e08993f069 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
 2005-06-13 20:40:53 +02:00
igor@igor-inspiron.creware.com
754e6c0527 func_if.result, func_if.test: 
Correction for test case of bug #11142.
 2005-06-13 11:38:16 -07:00
igor@igor-inspiron.creware.com
42271e4240 func_if.result, func_if.test: 
Added a test case for bug #11142.
item_cmpfunc.cc:
  Fixed bug #11142.
  Implementation of Item_func_nullif::is_null was corrected.
 2005-06-13 11:24:26 -07:00
tulin@dl145c.mysql.com
57ddf5223f logging_ok: 
Logging to logging@openlogging.org accepted
DbtcMain.cpp, testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
 2005-06-13 19:45:15 +02:00
igor@igor-inspiron.creware.com
df93c2783f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into igor-inspiron.creware.com:/home/igor/mysql-5.0
 2005-06-13 10:39:58 -07:00
igor@igor-inspiron.creware.com
36ff674468 Merge igor-inspiron.creware.com:/home/igor/mysql-4.1 
into igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0
 2005-06-13 07:35:46 -07:00
pekka@mysql.com
b5eddef181 ndb - valgrind fixes 2005-06-13 16:19:20 +02:00
heikki@hundin.mysql.fi
fcfc8d7ffe ha_innodb.cc: 
Add a patch by Georg Richter to remove compiler warnings on 64-bit Windows
 2005-06-13 16:42:00 +03:00
svoj@mysql.com
142529b803 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/yassl-mysql-5.0
 2005-06-13 18:35:17 +05:00
igor@igor-inspiron.creware.com
fdce34a385 Merge igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0 
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
 2005-06-13 06:28:23 -07:00
lars@mysql.com
cbe0d123f7 Making XID deterministic for rpl_ddl test 2005-06-13 15:18:36 +02:00
igor@igor-inspiron.creware.com
750fca61f9 ctype_utf8.test, ctype_utf8.result: 
Added a test case for bug #11167.
sql_select.cc:
  Fixed bug #11167.
  In 4.1 char/varchar fields are limited by 255 characters in
  length that make them longer than 255 bytes in size for such
  character sets as UTF8. The functions store_record_in_cache
  and read_cached_records did not take into account this
  Moreover the code did not take into account that the size
  of the varchar fields in 5.0 can be up to 65535 bytes
 2005-06-13 06:10:19 -07:00
svoj@mysql.com
b2cb16bf7c Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/yassl-mysql-5.0
 2005-06-13 17:17:58 +05:00
svoj@mysql.com
47c2e6d80e Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/yassl-mysql-5.0
 2005-06-13 16:16:06 +05:00
georg@lmy002.wdf.sap.corp
0c00f6b7be Merge grichter@bk-internal.mysql.com:/home/bk/mysql-5.0 
into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-5.0
 2005-06-13 12:44:46 +02:00
georg@lmy002.wdf.sap.corp
b64e6db5a4 fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
lars@mysql.com
d573d0c443 Merge mysql.com:/home/bk/b6883-mysql-4.1 
into mysql.com:/home/bk/mysql-5.0
 2005-06-13 11:56:45 +02:00
lars@mysql.com
928cb7ac13 Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 2005-06-13 11:13:06 +02:00
lars@mysql.com
c199d7fd66 Merge mysql.com:/home/bkroot/mysql-4.1 
into mysql.com:/home/bk/b6883-mysql-4.1
 2005-06-13 11:12:10 +02:00
joreland@mysql.com
ab1eaf0b32 merge 2005-06-13 10:42:12 +02:00
marko@hundin.mysql.fi
40516ad80c InnoDB: Remove unreferenced debug functions from non-debug builds. 2005-06-13 11:39:31 +03:00
joreland@mysql.com
109b150314 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-push
 2005-06-13 09:12:51 +02:00
joreland@mysql.com
3bfc52d14a Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-push
 2005-06-13 09:10:45 +02:00
joreland@mysql.com
2d64907d12 bug#10294 - ndb restore with #concurrent transactions < parallelism 
Enable retry on startTransaction
 2005-06-13 09:09:50 +02:00
svoj@mysql.com
685c844fc4 WL#2286 - Compile MySQL w/YASSL support 
Fix for link failures on boxes with non-gnu compiler.
 2005-06-12 18:18:46 +05:00
svoj@mysql.com
35dad7352d Merge 2005-06-11 15:48:11 +05:00
jimw@mysql.com
55f962c0cf Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-10 20:11:20 -07:00
kent@mysql.com
9e5baf5d02 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-06-11 00:23:22 +02:00
jimw@mysql.com
ff3f735c70 Merge jwinstead@production.mysql.com:my/mysql-4.1-10840 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-10 14:46:03 -07:00
reggie@mdk10.(none)
6a9ce670ea Merge mdk10.(none):/home/reggie/bk/mysql-4.1-base 
into mdk10.(none):/home/reggie/bk/mysql-5.0-base
 2005-06-10 16:45:54 -05:00
jimw@mysql.com
481f763255 Merge mysql.com:/home/jimw/my/mysql-4.1-9500 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-06-10 14:44:25 -07:00
kent@mysql.com
00ddd2c700 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gca 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
 2005-06-10 21:31:39 +02:00
kent@mysql.com
a2073df284 mtr_process.pl: 
Added a sleep for 5 seconds when shuting down,
  work around for strange problem with server restarts
mtr_cases.pl:
  Set default time zone as opt to mysqld
mysql-test-run.pl:
  Enabled --mysqld=<flags> to work
  Put some Windows path names into environment,
  to be used in --replace_result
mysql-test-run.sh:
  Make shell script tolerant to Windows change in test cases
 2005-06-10 21:29:37 +02:00
reggie@mdk10.(none)
dea4ede2dc Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mdk10.(none):/home/reggie/bk/50test2
 2005-06-10 14:18:53 -05:00
reggie@mdk10.(none)
6271cf51ac Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/41test3
 2005-06-10 14:17:32 -05:00
reggie@mdk10.(none)
b45bf71d9b Bug #10947 mysqlshow wildcard failure on Windows 2005-06-10 14:03:22 -05:00
serg@serg.mylan
b41f9b36cb Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-10 20:23:37 +02:00
kent@mysql.com
811e51ec84 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-06-10 20:12:45 +02:00
serg@serg.mylan
c9ff2b5050 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-10 18:40:33 +02:00
serg@serg.mylan
f265b3eb2b Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-10 18:11:40 +02:00
pem@mysql.comhem.se
ca0a72f815 Post-merge fix. 2005-06-10 18:06:12 +02:00
serg@serg.mylan
6f45ac2cb6 bug#11225 - distinct.test fails 2005-06-10 18:02:19 +02:00
svoj@mysql.com
a822c1ffed Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
 2005-06-10 20:55:36 +05:00
svoj@mysql.com
75c13cbe0b Merge with latest yaSSL. 
Fixes IsAligned yaSSL assertion failure.
 2005-06-10 20:09:41 +05:00
pem@mysql.com
b42bf3cc55 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-06-10 16:56:34 +02:00
pem@mysql.comhem.se
46619fa0e3 Post review and additional fix for BUG#10968: Stored procedures: crash if long loop. 
Fixed valgrind complaints. This fixes the memory leak problems for
  procedured, and partially for functions. There's still a leak involving
  results from functions that turned out to be too involved, so it will be
  fixed separately.
 2005-06-10 16:14:01 +02:00
obarnir@mysql.com
a64115d1f0 Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/omer/source/src50_0609
 2005-06-10 06:58:26 -07:00
lenz@mysql.com
d11be61a51 Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0
 2005-06-10 15:41:30 +02:00
lenz@mysql.com
abaae49cfd Merge mysql.com:/space/my/mysql-4.1-merge 
into mysql.com:/space/my/mysql-4.1-build
 2005-06-10 15:37:21 +02:00