mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53245 commits 2781 branches 343 tags 1.6 GiB
Commit graph

53245 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
mhansson/martin@riffraff.(none)
bcb6d2bec5 Bug #34367: sql/sql_show.cc: create_schema_table should handle 
MYSQL_TYPE_NEWDECIMAL

Added support for the type MYSQL_TYPE_NEWDECIMAL. It now works like
MYSQL_TYPE_DECIMAL. Unfortunately there cannot be a test case until
we have a working information_schema plugin as part of the source
distribution.
 2008-03-07 13:56:15 +01:00
gkodinov/kgeorge@magare.gmz
dbc3ef6c9f Merge magare.gmz:/home/kgeorge/mysql/work/B34909-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B34909-5.1-opt
 2008-03-07 11:19:51 +02:00
gkodinov/kgeorge@magare.gmz
560ec24079 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B34909-5.0-opt
 2008-03-07 11:17:31 +02:00
gkodinov/kgeorge@magare.gmz
11cd97ed6b Bug #34909: mysqldump returns a 0 status on error when using 
--master-data

No error code was returned by mysqldump if it detects that binary
logging is not enabled on the server.
Fixed by returning error code.
 2008-03-07 11:15:49 +02:00
sergefp@pslp.mylan
f883250fa9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  mysql.com:/home/psergey/mysql-5.0-bug34945
 2008-03-06 22:45:07 +03:00
kaa@kaamos.(none)
80d89023ea Fix for bug #34889: mysql_client_test::test_mysql_insert_id test fails 
sporadically

Under some circumstances, the mysql_insert_id() value after SELECT ...
INSERT could return a wrong value. This could happen when the last
SELECT ... INSERT did not involve an AUTO_INCREMENT column, but the
value of mysql_insert_id() was changed by some previous statements.

Fixed by checking the value of thd->insert_id_used in
select_insert::send_eof() and returning 0 for mysql_insert_id() if it
is not set.
 2008-03-05 16:02:33 +03:00
joerg@trift2.
d4025ce1a6 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M51/mysql-5.1
 2008-03-03 21:23:19 +01:00
joerg@trift2.
687d2131de Raise the version number after cloning 5.0.58 2008-03-03 21:19:58 +01:00
sergefp@mysql.com
b779af5503 BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql" 
- Apply Eric Bergen's patch: in join_read_always_key(), move ha_index_init() call
  to before the late NULLs filtering code.
- Backport function comments from 6.0.
 2008-03-03 20:35:44 +03:00
kaa@kaamos.(none)
48f9206576 Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-03 19:52:55 +03:00
kaa@kaamos.(none)
95fd6879c5 Merge kaamos.(none):/data/src/opt/mysql-5.0-opt 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-03 19:50:05 +03:00
kaa@kaamos.(none)
9b983f8a25 Merge kaamos.(none):/data/src/opt/bug31781/my51 
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
 2008-03-03 19:49:10 +03:00
kaa@kaamos.(none)
232e9d3cb9 Merge kaamos.(none):/data/src/opt/bug31781/my50 
into  kaamos.(none):/data/src/opt/mysql-5.0-opt
 2008-03-03 19:48:00 +03:00
gluh@mysql.com/mgluh.(none)
b3397208eb fixed test case problem on win 2008-03-03 20:29:58 +04:00
kaa@kaamos.(none)
92ba2cef63 Merge kaamos.(none):/data/src/opt/bug31781/my50 
into  kaamos.(none):/data/src/opt/bug31781/my51
 2008-03-03 17:34:43 +03:00
kaa@kaamos.(none)
bd53f960dd Fix for bug #31781: multi-table UPDATE with temp-pool enabled fails 
with errno 17

my_create() did not perform any checks for the case when a file is
successfully created by a call to open(), but the call to
my_register_filename() later fails because the number of open files
has exceeded the my_open_files limit. This can happen on platforms 
which do not have getrlimit(), and hence we do not know the real limit
for open files. In such a case an error was returned to a caller
although the file has actually been created. Since callers assume
my_create() to return an error only when it failed to create a file,
they did not perform any cleanups, leaving an 'orphaned' file on the
file system.

Fixed by adding a check for the above case to my_create() and ensuring
the newly created file is deleted before returning an error.

Creating a deterministic test case in the test suite is impossible,
because the exact steps required to reproduce the above situation
depend on the platform and/or environment (OS per-user limits, queries
executed by previous tests, startup parameters). The patch was
manually tested on Windows using examples posted in the bug report.
 2008-03-03 17:34:06 +03:00
gluh@mysql.com/mgluh.(none)
1411d27977 test case fix 2008-03-03 15:38:18 +04:00
gluh@mgluh.(none)
644fdc8c1b Merge mysql.com:/home/gluh/MySQL/mysql-5.0-opt 
into  mysql.com:/home/gluh/MySQL/mysql-5.1-opt
 2008-03-03 15:03:51 +04:00
anozdrin/alik@quad.
4772a72e92 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt
 2008-03-03 14:02:36 +03:00
gluh@mysql.com/mgluh.(none)
fc1ae07785 test case fix 2008-03-03 15:02:34 +04:00
holyfoot/hf@mysql.com/hfmain.(none)
fbbd4391d9 Bug #32801 wait_timeout.test fails randomly 
wait_timeout test enabled
 2008-03-03 12:16:43 +04:00
gshchepa/uchum@host.loc
00b942ebfd Merge host.loc:/home/uchum/work/5.0-opt-34830 
into  host.loc:/home/uchum/work/5.0-opt
 2008-03-01 12:24:55 +04:00
gshchepa/uchum@host.loc
6d24220689 Merge host.loc:/home/uchum/work/5.0-opt-34830 
into  host.loc:/home/uchum/work/5.1-opt
 2008-03-01 12:24:00 +04:00
davi@endora.local
004a280aef Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2008-02-29 11:18:13 -03:00
gluh@eagle.(none)
56e06f6ceb Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2008-02-29 17:59:24 +04:00
gluh@mysql.com/eagle.(none)
2f5abfd3ef fixed problem with embedded server 2008-02-29 17:58:35 +04:00
gluh@mysql.com/eagle.(none)
0596b1c6cd wrong merge fix 2008-02-29 17:50:01 +04:00
gluh@eagle.(none)
047bf49d95 Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
 2008-02-29 16:59:25 +04:00