mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21762 commits 2791 branches 343 tags 1.7 GiB
Commit graph

21762 commits

This branch
This branch
All branches
Author SHA1 Message Date
thek@kpdesk.mysql.com
8f24815af1 Merge kpdesk.mysql.com:/home/thek/dev/bug23240/my41-bug23240 
into  kpdesk.mysql.com:/home/thek/dev/mysql-4.1-runtime
 2007-02-19 15:26:07 +01:00
thek@kpdesk.mysql.com
dd41fd5732 Bug#23240 --init-file statements with NOW() reports '1970-01-01 11:00:00'as the date time 
- Starting time of a query sent by file bootstrapping wasn't initialized
  and starting time defaulted to 0. This later used value by the Now-
  item and is translated to 1970-01-01 11:00:00.
- marking the time with thd->set_time() before the call to 
  mysql_parse resolves this issue.
 2007-02-19 09:37:34 +01:00
malff/marcsql@weblab.(none)
dc8e36ebcf Merge weblab.(none):/home/marcsql/TREE/mysql-4.1 
into  weblab.(none):/home/marcsql/TREE/mysql-4.1-rtmerge
 2007-02-08 08:51:13 -07:00
tomas@poseidon.mysql.com
097c8431e2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.mysql.com:/home/tomas/mysql-4.1-ndb
 2007-02-08 00:25:30 +07:00
jani@a88-113-38-195.elisa-laajakaista.fi
1dd93dda08 Test and bug fixes and removed unneccessary files. 2007-02-05 17:09:44 +02:00
istruewing@chilla.local
972df14cc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-02 20:23:03 +01:00
istruewing@chilla.local
177a366e53 After merge fix 2007-02-02 20:19:13 +01:00
gluh@mysql.com/eagle.(none)
938de5eee4 another valgrind error fix for 4.1(backport from 5.0) 2007-02-02 17:18:42 +04:00
gluh@mysql.com/eagle.(none)
31c3059ae9 Valgrind errors 
added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
 2007-02-02 15:01:11 +04:00
istruewing@chilla.local
3a664472de After merge fix 2007-02-02 10:01:44 +01:00
lzhou/zhl@dev3-63.(none)
e208018f75 Merge dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/tree-merge/4.1/mysql-4.1-ndb
 2007-02-01 15:48:23 +00:00
istruewing@chilla.local
33e1d1091a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 15:51:25 +01:00
gluh@mysql.com/eagle.(none)
010dc0b55c Valgrind error fixes 
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
 2007-02-01 18:00:24 +04:00
istruewing@chilla.local
73e61944f7 Merge chilla.local:/home/mydev/mysql-4.0-axmrg 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 08:09:36 +01:00
istruewing@chilla.local
97cf413d55 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 07:52:28 +01:00
svoj@mysql.com/june.mysql.com
a69107598e Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines
 2007-01-31 16:17:27 +04:00
svoj@mysql.com/june.mysql.com
a51aae601d WL#3567 - MERGE engine: a check for underlying table conformance 
When a merge table is opened compare column and key definition of
underlying tables against column and key definition of merge table.

If any of underlying tables have different column/key definition
refuse to open merge table.
 2007-01-31 16:15:20 +04:00
jani/jamppa@production.mysql.com
0e9a64684d Merge bk://localhost:5559 
into  production.mysql.com:/usersnfs/jamppa/mysql-4.0
 2007-01-30 17:52:27 +01:00
jani@ua141d10.elisa.omakaista.fi
b3523e398c Cleanup of thread-type (linuxthread or NTPL) detection code 
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
 2007-01-30 18:52:26 +02:00
istruewing@chilla.local
79e099e8a6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-01-29 17:20:18 +01:00
gluh@mysql.com/eagle.(none)
658777d808 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/4.1
 2007-01-26 16:28:32 +04:00
jani@ua141d10.elisa.omakaista.fi
0b4ee9e5b8 Cleanup of thread-type (linuxthread or NTPL) detection code 
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
 2007-01-25 20:10:31 +02:00
istruewing@chilla.local
06a8c16f6f Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug24607
 2007-01-24 17:35:14 +01:00
istruewing@chilla.local
928d672c46 Bug#24607 - MyISAM pointer size determined incorrectly 
Fixed test. On 32-bit machines which compile without
-DBIG_TABLES, MAX_ROWS is truncated to a 32-bit value.
Using a value below 4G is portable.
 2007-01-24 13:17:01 +01:00
df@kahlann.erinye.com
09add20d4c Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2007-01-24 09:26:08 +01:00
df@kahlann.erinye.com
9665651457 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2007-01-24 09:23:48 +01:00
svoj@mysql.com/june.mysql.com
02212e6ace Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-4.1-engines
 2007-01-24 11:38:23 +04:00
tomas@poseidon.mysql.com
292ba83f40 Bug#25668 mysqld may core if cluster disconnected 
- recommit in 4.1
 2007-01-24 09:41:40 +07:00
istruewing@chilla.local
26153490ec Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-bug24607
 2007-01-23 22:27:03 +01:00
joerg@trift2.
021d31180c Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  trift2.:/MySQL/M41/push-4.1
 2007-01-23 10:47:21 +01:00
igor@olga.mysql.com
9659c11b6e Fixed bug #25637: LEFT JOIN with BOOLEAN FULLTEXT loses left table matches. 
The bug is actually a duplicate of the bug 14708.
Down-ported the fix for 14708 from 5.0.  
Merged the test case for bug 14708 from 5.0.
 2007-01-22 14:23:53 -08:00
df@kahlann.erinye.com
cf53cd27b0 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2007-01-22 18:49:03 +01:00
df@kahlann.erinye.com
5fe6fc1d2f Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2007-01-22 16:33:37 +01:00
df@kahlann.erinye.com
c124372550 after-merge fix 2007-01-22 16:32:57 +01:00
df@kahlann.erinye.com
58bf072264 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2007-01-22 16:30:53 +01:00
svoj@mysql.com/june.mysql.com
afaebb6d62 BUG#24401 - MySQL server crashes if you try to retrieve data from 
corrupted table

Accessing a table with corrupted column definition results in server
crash.

This is fixed by refusing to open such tables. Affects MyISAM only.
No test case, since it requires crashed table.
 2007-01-22 16:34:58 +04:00
df@kahlann.erinye.com
930a1fe146 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2007-01-22 12:50:38 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
f6e70c1453 Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.0 
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
 2007-01-22 03:33:59 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
ff58749b29 Fix for configure to detect library correctly. 
Fix to check library in use during runtime.
Fix for Bug#16995, "idle connections not being killed due to timeout when NPTL is used".
 2007-01-22 02:32:07 +02:00
malff/marcsql@weblab.(none)
436e1f591a Bug#24562 (ALTER TABLE ... ORDER BY ... with complex expression asserts) 
WL#3681 (ALTER TABLE ORDER BY)

Before this fix, the ALTER TABLE statement implemented an ORDER BY option
with the following characteristics :

1) The order by clause accepts a list of criteria, with optional ASC or
DESC keywords

2) Each criteria can be a general expression, involving operators,
native functions, stored functions, user defined functions, subselects ...

With this fix :

1) has been left unchanged, since it's a de-facto existing feature,
that was already present in the code base and partially covered in the test
suite. Code coverage for ASC and DESC was missing and has been improved.

2) has been changed to limit the kind of criteria that are permissible:
now only a column name is valid.
 2007-01-18 16:53:49 -07:00
tsmith@siva.hindu.god
f5aab8b213 ndb_types.test: sleep a bit longer, to ensure that timestamp > @now 2007-01-18 13:26:26 -07:00
tsmith@siva.hindu.god
5817465426 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
 2007-01-18 10:36:46 -07:00
tsmith@siva.hindu.god
6fd02a439f Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
 2007-01-18 09:53:30 -07:00
tsmith@siva.hindu.god
eec44018b2 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
 2007-01-18 09:32:41 -07:00
tsmith@siva.hindu.god
2dc96063b4 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
 2007-01-18 09:20:25 -07:00
tsmith@siva.hindu.god
4b3840612e Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
 2007-01-18 08:52:45 -07:00
joerg/mysqldev@mysql.com/production.mysql.com
c3ab6de255 Raise version number after cloning 4.0.29 2007-01-18 16:41:32 +01:00
df@kahlann.erinye.com
f37e35419e Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
 2007-01-18 10:45:58 +01:00
tsmith@siva.hindu.god
d6d7385a18 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
 2007-01-17 16:40:41 -07:00
tsmith@siva.hindu.god
018acedba7 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
 2007-01-17 16:40:17 -07:00