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

49128 commits

This branch
This branch
All branches
Author SHA1 Message Date
kostja@bodhi.(none)
256450d881 Fix one more warning. 2007-08-06 23:43:53 +04:00
jbruehe/mysqldev@mysql.com/production.mysql.com
0afb19f555 Raise version number after cloning 5.1.21-beta 2007-08-06 21:11:09 +02:00
kostja@bodhi.(none)
4cc808b7cf Fix "db_cl_altered might be used uninitialized" warning. 2007-08-06 22:52:50 +04:00
kostja@bodhi.(none)
057ab256cc Fix warnings. 2007-08-06 22:49:47 +04:00
kostja@bodhi.(none)
0c4d8e0032 Fix failing ddl_i18n* tests in the team tree. 2007-08-06 22:42:13 +04:00
kostja@bodhi.(none)
f4cfa793e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-08-06 14:29:56 +04:00
kostja@bodhi.(none)
ec5464d2e0 A fix and a test case for Bug#29306 "Truncated data in MS Access with decimal (3,1) columns in a 
VIEW".

mysql_list_fields() C API function would incorrectly set MYSQL_FIELD::decimals
member for some view columns.

The problem was in an incomplete implementation of 
Item_ident_for_show::make_field(), which is responsible for view
columns metadata.
 2007-08-06 14:22:24 +04:00
kent@kent-amd64.(none)
add9cb76b5 Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
 2007-08-06 08:33:20 +02:00
kent@mysql.com/kent-amd64.(none)
d75c7a58c1 make_win_bin_dist: 
Corrected install path
 2007-08-06 08:31:09 +02:00
kent@mysql.com/kent-amd64.(none)
f9fdd5ae8c make_win_bin_dist: 
Copy embedded .pdb and static debug lib
 2007-08-06 08:28:16 +02:00
kent@kent-amd64.(none)
0065e85e32 Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
 2007-08-06 01:35:43 +02:00
kent@mysql.com/kent-amd64.(none)
6ab4112c37 mysql-test-run.pl: 
Search "relwithdebinfo" directory in CMake Visual Studio build
  Search for "mysqld-debug" even in source tree
 2007-08-06 01:29:53 +02:00
df@pippilotta.erinye.com
239f6aa312 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-08-05 16:43:03 +02:00
df@pippilotta.erinye.com
17e76114c9 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-08-05 16:37:34 +02:00
df@pippilotta.erinye.com
0285a32afb Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
 2007-08-05 16:37:20 +02:00
dlenev@mockturtle.local
c3e3a5e188 Added test for bug #21281 "Pending write lock is incorrectly removed 
when its statement being KILLed". The bug itself was fixed by separate
patch in 5.0 tree.
 2007-08-05 13:55:37 +04:00
dlenev@mockturtle.local
ec2aeb4fae Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21281 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-bg21281-2
 2007-08-05 13:26:10 +04:00
dlenev@mockturtle.local
a43431b3a1 Fix for bug #21281 "Pending write lock is incorrectly removed when its 
statement being KILLed".

When statement which was trying to obtain write lock on then table and
which was blocked by existing read lock was killed, concurrent statements
that were trying to obtain read locks on the same table and that were
blocked by the presence of this pending write lock were not woken up and
had to wait until this first read lock goes away.

This problem was caused by the fact that we forgot to wake up threads
which pending requests could have been satisfied after removing lock
request for the killed thread.

The patch solves the problem by waking up those threads in such situation.

Test for this bug will be added to 5.1 only as it has much better
facilities for its implementation. Particularly, by using I_S.PROCESSLIST
and wait_condition.inc script we can wait until thread will be blocked on
certain table lock without relying on unconditional sleep (which usage
increases time needed for test runs and might cause spurious test
failures on slower platforms).
 2007-08-05 13:17:07 +04:00
df@pippilotta.erinye.com
f0f9652988 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-04 11:08:11 +02:00
df@pippilotta.erinye.com
ec7dccce7f Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
 2007-08-04 09:55:45 +02:00
iggy@amd64.(none)
b880985ea7 Post Merge Fixup. 2007-08-04 02:51:58 -04:00
iggy@amd64.(none)
64b6c61108 Merge amd64.(none):/src/mysql-5.1-maint 
into  amd64.(none):/src/mysql-5.1-build_29903
 2007-08-03 21:44:59 -04:00
cbell/Chuck@mysql_cab_desk.
3b39789e4e Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl-push 
into  mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
 2007-08-03 21:43:25 -04:00
iggy@amd64.(none)
171f402ad4 Bug#29903 The CMake build method does not produce the embedded library. 
- GCov fix.
 2007-08-03 21:08:48 -04:00
iggy@amd64.(none)
35b1a59841 Bug#29903 The CMake build method does not produce the embedded library. 
- Additional changes to correct link failure in Do-linkall script.
 2007-08-03 18:56:24 -04:00
df@pippilotta.erinye.com
db15f4daeb Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-04 00:46:33 +02:00
df@pippilotta.erinye.com
d268c7e0fc Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-08-04 00:44:51 +02:00
kent@kent-amd64.(none)
405522690d Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
 2007-08-04 00:29:47 +02:00
kent@mysql.com/kent-amd64.(none)
abf4895367 CMakeLists.txt: 
Removed space between '-D' and symbol
 2007-08-04 00:26:46 +02:00
kent@kent-amd64.(none)
6b9ac5b7cf Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
 2007-08-03 22:57:21 +02:00
df@pippilotta.erinye.com
eba0752b45 after-merge fix 2007-08-03 22:02:19 +02:00
kent@mysql.com/kent-amd64.(none)
a6d082f36d CMakeLists.txt, README, configure.js 
Several adjustments to make client libraries pass the link test
  on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)
 2007-08-03 21:51:37 +02:00
iggy@amd64.(none)
3ed9739c82 Bug#29903 The CMake build method does not produce the embedded library. 
- Changes to correct and test Windows embedded build.
 2007-08-03 14:43:12 -04:00
mkindahl@dl145h.mysql.com
92d4958eb7 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
 2007-08-03 19:04:59 +02:00
mkindahl@dl145h.mysql.com
ea9848094a Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team
 2007-08-03 18:59:16 +02:00
df@pippilotta.erinye.com
7c29bcda22 merge fix 2007-08-03 18:57:18 +02:00
mkindahl@dl145h.mysql.com
efb82b3aac Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team
 2007-08-03 18:56:06 +02:00
dfischer@bk-internal.mysql.com
1230d8fb68 .del-readme.txt-grumble-grumble: 
Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble
 2007-08-03 18:31:54 +02:00
df@pippilotta.erinye.com
493634e4c7 Merge bk-internal:/home/bk/mysql-5.1-marvel 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
 2007-08-03 17:15:23 +02:00
mkindahl@dl145h.mysql.com
6cc184aa1b Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2007-08-03 17:14:46 +02:00
mkindahl@dl145h.mysql.com
008d2b2537 Fixes to eliminate valgrind warnings. 2007-08-03 17:12:00 +02:00
df@pippilotta.erinye.com
3d986fde8d Merge bk-internal:/home/bk/mysql-5.1-engines 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
 2007-08-03 16:53:06 +02:00
df@pippilotta.erinye.com
5ad3f6083e add mysqlslap back to windows builds for 5.1 2007-08-03 14:43:11 +02:00
bar@bar.myoffice.izhnet.ru
fb8dff9721 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28875
 2007-08-03 17:16:02 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
7754da28f9 After merge fix 2007-08-03 15:57:14 +05:00
bar@bar.myoffice.izhnet.ru
c01ce7b1e3 Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875 
into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl
 2007-08-03 15:30:31 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
4eebfd09c2 Bug#28875 Conversion between ASCII and LATIN1 charsets does not function 
(Regression, caused by a patch for the bug 22646).
Problem: when result type of date_format() was changed from
binary string to character string, mixing date_format()
with a ascii column in CONCAT() stopped to work.
Fix:
- adding "repertoire" flag into DTCollation class,
to mark items which can return only pure ASCII strings.
- allow character set conversion from pure ASCII to other character sets.
 2007-08-03 15:25:23 +05:00
gluh@mysql.com/eagle.(none)
481cb830d1 powermacg5 problem fix 
we need a copy of I_S name because the name can be changed in case of lowercase_table_name!=0
 2007-08-03 14:17:51 +05:00
joerg@trift2.
fdf4026425 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/cmake-5.1
 2007-08-03 11:10:25 +02:00
joerg@trift2.
d63f8f48fb Re-apply fixes originally made by Kent, 
they got lost because of a merge conflict with the CMakeLists.txt 
dependency fix (numer 29982 in our bugs DB).

These changes are for bug#30118.
 2007-08-03 11:06:53 +02:00