mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53276 commits 2781 branches 343 tags 1.6 GiB
Commit graph

53276 commits

This branch
This branch
All branches
Author SHA1 Message Date
gshchepa/uchum@host.loc
2a3cc7f350 Merge host.loc:/home/uchum/work/5.0-opt 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-25 19:49:27 +04:00
gshchepa/uchum@host.loc
1eb00401f4 information_schema.test, information_schema.result: 
Minor test case cleanup after bug#34529.
 2008-03-25 19:44:27 +04:00
mhansson/autopush@riffraff.(none)
13d3e8af83 Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  riffraff.(none):/data0/autopush/my50-bug34529
 2008-03-24 16:19:50 +01:00
gkodinov/kgeorge@magare.gmz
53f34e0cd7 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/warnings-5.1-opt
 2008-03-24 09:10:20 +02:00
holyfoot/hf@hfmain.(none)
0b9d543a6d Merge mysql.com:/home/hf/work/33334/my50-33334 
into  mysql.com:/home/hf/work/33334/my51-33334
 2008-03-23 21:57:36 +04:00
holyfoot/hf@hfmain.(none)
0440eb7798 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/33334/my51-33334
 2008-03-23 21:55:02 +04:00
holyfoot/hf@hfmain.(none)
28b8fa10a8 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/33334/my50-33334
 2008-03-23 21:53:36 +04:00
holyfoot/hf@hfmain.(none)
766998684d Merge mysql.com:/home/hf/work/33334/my50-33334 
into  mysql.com:/home/hf/work/33334/my51-33334
 2008-03-23 20:35:00 +04:00
gkodinov/kgeorge@macbook.gmz
ba2ba4548d merge bug 26461 to 5.1-opt 2008-03-23 14:29:35 +02:00
gkodinov/kgeorge@magare.gmz
f6871c0d66 Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B26461-5.1-opt
 2008-03-21 17:48:28 +02:00
gkodinov/kgeorge@magare.gmz
dff2a4c3a3 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-opt
 2008-03-21 17:26:18 +02:00
gkodinov/kgeorge@macbook.gmz
ff0aac178d Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes) 
The bool data type was redefined to BOOL (4 bytes on windows).
Removed the #define and fixed some of the warnings that were uncovered
by this.
Note that the fix also disables 2 warnings :
4800 : 'type' : forcing value to bool 'true' or 'false' (performance warning)
4805: 'operation' : unsafe mix of type 'type' and type 'type' in operation

These warnings will be handled in a separate bug, as they are performance related or bogus.

Fixed to int the return type of functions that return more than 
2 distinct values.
 2008-03-21 17:23:17 +02:00
gshchepa/uchum@host.loc
9d03658bf2 Merge host.loc:/home/uchum/work/5.0-opt 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-20 02:44:08 +04:00
gshchepa/uchum@host.loc
9b6f0f3a79 Merge host.loc:/home/uchum/work/PA/5.0-opt-34763 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-20 00:30:37 +04:00
gshchepa/uchum@host.loc
e57eaf0cef Merge host.loc:/home/uchum/work/PA/5.0-opt-34763 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-20 00:29:50 +04:00
kaa@kaamos.(none)
938369446c Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-19 16:33:41 +03:00
mhansson/martin@riffraff.(none)
86db2a0cd5 Bug#34529: Crash on complex Falcon I_S select after ALTER .. PARTITION BY 
When swapping out heap I_S tables to disk, this is done after plan refinement.
Thus, READ_RECORD::file will still point to the (deleted) heap handler at start
of execution. This causes segmentation fault if join buffering is used and the 
query is a star query where the result is found to be empty before accessing
some table. In this case that table has not been initialized (i.e. had its 
READ_RECORD re-initialized) before the cleanup routine tries to close the handler.
Fixed by updating READ_RECORD::file when changing handler.
 2008-03-19 14:32:28 +01:00
kaa@kaamos.(none)
cf68ce0fbf Merge kaamos.(none):/data/src/opt/bug34512/my51 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-19 16:31:26 +03:00
kaa@kaamos.(none)
a7d92c9879 Merge kaamos.(none):/data/src/opt/bug34512/my50 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-19 16:30:56 +03:00
holyfoot/hf@mysql.com/hfmain.(none)
635b44f19b Bug #33334 mysqltest_embedded crashes when disconnecting before reap. 
Before breaking the connection we have to check that there's no query
  executing at the moment. Otherwise it can lead to crash in embedded server.
 2008-03-19 15:51:22 +04:00
kaa@kaamos.(none)
e7d169fbde Merge kaamos.(none):/data/src/opt/bug34512/my50 
into  kaamos.(none):/data/src/opt/bug34512/my51
 2008-03-19 14:25:36 +03:00
kaa@kaamos.(none)
2b58fa027a Merge kaamos.(none):/data/src/opt/bug34650/my51 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-19 12:18:16 +03:00
gluh@mysql.com/mgluh.(none)
106cd87059 Bug#35406 5.1-opt crashes on select from I_S.REFERENTIAL_CONSTRAINTS 
added intialization of f_key_info.referenced_key_name for the case when
referenced table is dropped
 2008-03-18 19:42:04 +04:00
gshchepa/uchum@host.loc
cf90fb5571 Fixed bug #34763. 
Queries like:

  SELECT ROW(1, 2) IN (SELECT t1.a, 2)
    FROM t1 GROUP BY t1.a

or 

  SELECT ROW(1, 2) IN (SELECT t1.a, 2 FROM t2)
    FROM t1 GROUP BY t1.a

lead to assertion failure in the
Item_in_subselect::row_value_transformer method in debugging
build, or to unexpected error message in release build:

  ERROR 1247 (42S22): Reference '<list ref>' not supported (forward
                      reference in item list)

Unexpected error message and assertion failure have been
eliminated.
 2008-03-14 23:11:59 +04:00
gluh@mysql.com/eagle.(none)
2f719d02c9 Bug#35108 SELECT FROM REFERENTIAL_CONSTRAINTS crashes 
referenced_key_name field can be uninitialized in the case when
referenced table is dropped.
Added codition which allows to handle this situation.
 2008-03-14 14:12:39 +04:00
kaa@kaamos.(none)
eac3a26efa Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-13 12:19:56 +03:00
kaa@kaamos.(none)
3bff5b59c6 Bug#35103 mysql_client_test::test_bug29948 causes sporadic failures 
Disable test case for bug 29948, which is causing sporadically
failures in other tests inside mysql_client_test.
 2008-03-13 12:14:14 +03:00
kaa@kaamos.(none)
06bf29cf0f Fixed test failures caused by insufficient cleanups in the tests for 
bug12713.
 2008-03-12 16:52:29 +03:00
kaa@kaamos.(none)
11c336b805 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 13:56:50 +03:00
kaa@kaamos.(none)
28b4988ee4 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 13:29:50 +03:00
kaa@kaamos.(none)
9c811ddec9 Post-merge fix. 2008-03-12 13:22:58 +03:00
kaa@kaamos.(none)
a48f1d24ab Re-enabled the test for mysql_insert_id() after merging from main. 2008-03-12 12:13:41 +03:00
kaa@kaamos.(none)
ae93d258aa Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 11:21:12 +03:00
kaa@kaamos.(none)
0a7052e4d3 Merge kaamos.(none):/data/src/mysql-5.1 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-12 11:19:46 +03:00
kaa@kaamos.(none)
815898f3a8 Merge kaamos.(none):/data/src/opt/mysql-4.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-12 11:00:52 +03:00
kaa@kaamos.(none)
d0eb90501d Merge kaamos.(none):/data/src/mysql-5.0 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-12 10:59:15 +03:00
kaa@kaamos.(none)
9510da1916 Merge kaamos.(none):/data/src/mysql-4.1 
into  kaamos.(none):/data/src/opt/mysql-4.1-opt
 2008-03-12 10:53:15 +03:00
kaa@kaamos.(none)
7e365efa30 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-11 15:47:16 +03:00
mhansson/martin@riffraff.(none)
3d87b263d9 Merge mhansson@bk-internal:/home/bk/mysql-5.1-opt 
into  riffraff.(none):/data0/martin/bug34367/my51-bug34367-pushee
 2008-03-11 11:31:59 +01:00
holyfoot/hf@hfmain.(none)
e0851650e1 Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/32801/my51-32801
 2008-03-11 11:20:36 +04:00
tnurnberg@white.intern.koehntopp.de
f5b93ab932 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/34749/51-34749
 2008-03-10 07:39:04 +01:00
tnurnberg@white.intern.koehntopp.de
3a87bbfe42 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/34749/50-34749
 2008-03-10 07:11:12 +01:00
tnurnberg@white.intern.koehntopp.de
fd2bae9981 Merge mysql.com:/misc/mysql/34749/50-34749 
into  mysql.com:/misc/mysql/34749/51-34749
 2008-03-10 07:07:56 +01:00
tnurnberg@white.intern.koehntopp.de
10bf47abf3 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  mysql.com:/misc/mysql/29645/51-29645
 2008-03-10 06:52:32 +01:00
tnurnberg@white.intern.koehntopp.de
f2b153a2a5 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/misc/mysql/29645/50-29645
 2008-03-10 06:48:55 +01:00
tnurnberg@white.intern.koehntopp.de
6ad2340f63 Merge mysql.com:/misc/mysql/29645/50-29645 
into  mysql.com:/misc/mysql/29645/51-29645
 2008-03-10 06:44:31 +01:00
kaa@kaamos.(none)
71d67f7f51 Merge kaamos.(none):/data/src/opt/bug34889/my51 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-08 14:21:21 +03:00
kaa@kaamos.(none)
ace5022619 Merge kaamos.(none):/data/src/opt/bug34889/my50 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-08 14:20:55 +03:00
kaa@kaamos.(none)
88a1ab6ce8 Merge kaamos.(none):/data/src/opt/bug34889/my50 
into  kaamos.(none):/data/src/opt/bug34889/my51
 2008-03-08 11:21:11 +03:00
gshchepa/uchum@host.loc
6afe788a55 Merge host.loc:/home/uchum/work/5.0-opt 
into  host.loc:/home/uchum/work/5.0-opt-34763
 2008-03-07 23:30:03 +04:00