mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
54249 commits 2793 branches 343 tags 1.5 GiB
Commit graph

54249 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.mysql.com
ee6373ab7c Remove unused variable 2008-05-02 19:44:18 +02:00
msvensson@pilot.mysql.com
8d35b57b37 Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-bugteam
 2008-05-02 19:42:34 +02:00
msvensson@pilot.mysql.com
43f594bdf6 Merge pilot.mysql.com:/data/msvensson/mysql/my50-bt-36463 
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-bugteam
 2008-05-02 19:01:32 +02:00
msvensson@pilot.mysql.com
e549ba8067 Bug#36469 mysql_upgrade does not use --tmpdir 2008-05-02 14:41:19 +02:00
msvensson@pilot.mysql.com
4cede4a3bf Bug#35986 valgrind warning in DbugParse for empty string in SET GLOBAL DEBUG="" 
- Code in DbugParse was reading from beyond end of the control string
 2008-05-02 12:49:31 +02:00
msvensson@pilot.mysql.com
c1918b0464 Bug#36465 mysqltest should always use the --tmpdir 2008-05-02 11:22:10 +02:00
msvensson@pilot.mysql.com
4600fc3f34 Bug#36463 mysql-test-run.pl should always use the --tmpdi 2008-05-02 09:13:43 +02:00
pcrews@pcrews-mac-local.local
0c9d8d13f1 Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.0-trigs 
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs
 2008-05-01 12:36:56 -04:00
pcrews@pcrews-mac-local.local
7fee7908a3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam 
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.0-trigs
 2008-05-01 12:15:38 -04:00
pcrews@pcrews-mac-local.local
b3510ccf90 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs
 2008-05-01 11:58:39 -04:00
pcrews@pcrews-mac-local.local
91e893bca1 Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.0-trigs 
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/build_work/mysql-5.1-trigs
 2008-05-01 11:37:34 -04:00
pcrews@pcrews-mac-local.local
853b9f4d0c Bug#36026 - Test funcs_1.<engine>_trig_03 failing on Windows 
Bug#36028 - Test funcs_1.<engine>_trig_03e failing on Windows
Bug#36029 - Test funcs_1.<engine>_trig_0407 failing on Windows
Bug#36030 - Test funcs_1.<engine>_trig_08 failing on Windows

Adding $MASTER_MYSOCK to init_win_path()
When path names are short, master.sock ends up in MYSQL_TMP_DIR, but with longer path names,
master.sock ends up in /tmp/<random_string>/ and these tests will fail due to path delimiter difference.

New changeset to start with 5.0 -- Not all of these tests are present in 5.0, but want to keep mysqltest the same
 2008-05-01 11:36:03 -04:00
gkodinov/kgeorge@magare.gmz
6cc28909e9 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  magare.gmz:/home/kgeorge/mysql/autopush/B36041-5.1-bugteam
 2008-05-01 17:51:26 +03:00
gkodinov/kgeorge@magare.gmz
c9428af688 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  magare.gmz:/home/kgeorge/mysql/autopush/B36041-5.1-bugteam
 2008-05-01 16:34:14 +03:00
gkodinov/kgeorge@magare.gmz
79a709bd60 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  magare.gmz:/home/kgeorge/mysql/autopush/B35298-5.1-bugteam
 2008-05-01 16:15:38 +03:00
gkodinov/kgeorge@magare.gmz
4ddfccdab1 Merge bk-internal:/home/bk/mysql-5.0-bugteam 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
 2008-05-01 15:59:51 +03:00
gkodinov/kgeorge@magare.gmz
c00605c6cf Merge magare.gmz:/home/kgeorge/mysql/work/B35298-5.0-bugteam 
into  magare.gmz:/home/kgeorge/mysql/work/B35298-5.1-bugteam
 2008-05-01 14:54:59 +03:00
gkodinov/kgeorge@magare.gmz
e22ef24263 Fix for bug #35298: GROUP_CONCAT with DISTINCT can crash the server 
The bug is a regression introduced by the patch for bug32798.

The code in Item_func_group_concat::clear() relied on the 'distinct'
variable to check if 'unique_filter' was initialized. That, however,
is not always valid because Item_func_group_concat::setup() can do
shortcuts in some cases w/o initializing 'unique_filter'.

Fixed by checking the value of 'unique_filter' instead of 'distinct'
before dereferencing.
 2008-05-01 13:49:26 +03:00
gkodinov/kgeorge@magare.gmz
771d861c99 Merge bk-internal:/home/bk/mysql-5.0 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteam
 2008-05-01 13:40:56 +03:00
gkodinov/kgeorge@magare.gmz
3c469aaaa7 Merge bk-internal:/home/bk/mysql-5.1 
into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam
 2008-05-01 13:25:38 +03:00
tsmith@ramayana.hindu.god
5fa0982adb Use ulonglong to store row count in libmysld Protocol_text::remove_last_row() 
(fix warnings).
 2008-04-30 19:14:41 -06:00
tsmith@ramayana.hindu.god
7f00fb606a Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-04-30 18:30:08 -06:00
tsmith@ramayana.hindu.god
2c71b09c46 Handle a few failing test cases 2008-04-30 17:39:51 -06:00
tsmith@ramayana.hindu.god
e1cb925b29 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2008-04-30 17:30:39 -06:00
aelkin/andrei@mysql1000.dsl.inet.fi
9afdba04d6 Bug #36435 rpl_events uses non-deterministic check 
Select of the test could not perform deterministically, because the table remains to be 
updatable by the running event handler.

Fixed with changing verification to use a logical values instead of comparison 
with a pre-recorded results.
 2008-04-30 21:41:50 +03:00
hhunger@hh-nb.hungers
a7e7fbd3a1 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-30 18:50:18 +02:00
hhunger@hh-nb.hungers
890eed08d9 the query_cache_wlock_invalidate_func fails due to bug 35390 and is therefore disabled. 2008-04-30 18:45:20 +02:00
davi@endora.local
e24f509d2c Merge mysql.com:/Users/davi/mysql/bugs/35788-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
 2008-04-30 13:00:21 -03:00
davi@mysql.com/endora.local
2bf61233fa Bug#35788 A few tests fail due to concurrent inserts 
The problem is that since MyISAM's concurrent_insert is on by
default some concurrent SELECT statements might not see changes
made by INSERT statements in other connections, even if the
INSERT statement has returned.

The solution is to disable concurrent_insert so that INSERT
statements returns after the data is actually visible to other
statements.
 2008-04-30 10:28:19 -03:00
davi@endora.local
9045798dea Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  mysql.com:/Users/davi/mysql/mysql-5.1-bugteam
 2008-04-30 10:15:32 -03:00
hhunger@hh-nb.hungers
903e0b4ed5 Merge hh-nb.hungers:/work/trees/mysql-5.1-build-src-clean 
into  hh-nb.hungers:/work/merge/mysql-5.1-build
 2008-04-30 15:09:51 +02:00
hhunger@hh-nb.hungers
f1850f5e47 Fix for bug 35988. 2008-04-30 14:49:37 +02:00
tsmith@ramayana.hindu.god
85a01db242 Merge ramayana.hindu.god:/home/tsmith/m/bk/bugteam/mrg/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-04-29 20:56:44 -06:00
tsmith@ramayana.hindu.god
a1a1aaa524 Merge ramayana.hindu.god:/home/tsmith/m/bk/bugteam/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-04-29 20:55:48 -06:00
tsmith@ramayana.hindu.god
400d796d72 Merge ramayana.hindu.god:/home/tsmith/m/bk/bugteam/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/bugteam/mrg/51
 2008-04-29 20:50:04 -06:00
gkodinov/kgeorge@magare.gmz
0cbca19357 Bug #36041: mysql-test-run doesn't seem to string match 
100% effectively on Windows

The mysqltest docs state that the 'replace_result' command
doesn't perform any escape processing.
However the current implementation was processing backslash 
escapes in the from/to strings.
This prevents replacing e.g. patch on windows (where backslash
is used as a path separator).
Fixed by removing the backslash escape processing from 
'replace_result'.
 2008-04-29 19:08:52 +03:00
tsmith@ramayana.hindu.god
ee3e6afa18 Merge mysqldev@production:my/build-200803311521-5.1.24-rc/mysql-5.1-release 
into  ramayana.hindu.god:/home/tsmith/m/bk/bugteam/mrg/51
 2008-04-28 21:23:29 -06:00
davi@mysql.com/endora.local
a454190f0d Backport kostja's fix for Bug#32724 "innodb_mysql.test fails randomly". 
Enable back the disabled test case.
 2008-04-29 00:03:19 -03:00
kent@mysql.com/kent-amd64.(none)
eaa4d4e5a7 make_binary_distribution.sh: 
Copy all of the "std_data" directory
 2008-04-28 21:53:52 +02:00
iggy@amd64.(none)
c59d072a8c Merge amd64.(none):/src/mysql-5.0-release 
into  amd64.(none):/src/rel_clean_up/my50-release
 2008-04-28 15:03:33 -04:00
iggy@amd64.(none)
584f23ee77 Merge amd64.(none):/src/rel_clean_up/my50-rel_clean_up 
into  amd64.(none):/src/rel_clean_up/my51-rel_clean_up
 2008-04-28 15:03:07 -04:00
iggy@amd64.(none)
02ad758132 Merge amd64.(none):/src/rel_clean_up/my50-release 
into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up
 2008-04-28 15:00:31 -04:00
iggy@amd64.(none)
27663116b4 Correct failing build. 2008-04-28 14:58:32 -04:00
iggy@amd64.(none)
a961b77c11 Merge amd64.(none):/src/rel_clean_up/my50-rel_clean_up 
into  amd64.(none):/src/rel_clean_up/my51-rel_clean_up
 2008-04-28 14:12:52 -04:00
iggy@amd64.(none)
a975c7ef5f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-bugteam 
into  amd64.(none):/src/rel_clean_up/my51-rel_clean_up
 2008-04-28 14:04:03 -04:00
iggy@amd64.(none)
3d0f5666ce Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteam 
into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up
 2008-04-28 13:58:19 -04:00
iggy@amd64.(none)
7a4adfa97b Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  amd64.(none):/src/rel_clean_up/my50-release
 2008-04-28 13:56:15 -04:00
iggy@amd64.(none)
2269de53a5 Merge amd64.(none):/src/rel_clean_up/my50-rel_clean_up 
into  amd64.(none):/src/rel_clean_up/my51-rel_clean_up
 2008-04-28 13:42:59 -04:00
iggy@amd64.(none)
666d0d0637 Merge amd64.(none):/src/rel_clean_up/my50-release 
into  amd64.(none):/src/rel_clean_up/my50-rel_clean_up
 2008-04-28 13:41:50 -04:00
iggy@amd64.(none)
997af9c136 Avoid compilation problem on AIX. 2008-04-28 13:41:12 -04:00