mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-02 09:13:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
37461 commits 2853 branches 349 tags 1.7 GiB
Commit graph

37461 commits

Author SHA1 Message Date
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@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
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
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
kent@mysql.com/kent-amd64.(none)
abf4895367 CMakeLists.txt: 
Removed space between '-D' and symbol
 2007-08-04 00:26:46 +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
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
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
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
joerg@trift2.
52f71ecc67 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-02 22:11:49 +02:00
joerg@trift2.
7c6a0cf03f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  trift2.:/MySQL/M41/push-4.1
 2007-08-02 22:09:52 +02:00
joerg@trift2.
0bd847f013 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-02 21:49:42 +02:00
joerg@trift2.
8888c54081 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-02 21:30:35 +02:00
kent@mysql.com/kent-amd64.(none)
838a98c1e6 make_win_bin_dist: 
Simplified copying of 'mysql-test' directory
 2007-08-02 20:51:04 +02:00
jperkin@production.mysql.com
0a7599a71e Merge production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-4.1 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-5.0
 2007-08-02 18:57:50 +02:00
jperkin@production.mysql.com
21cb71adb0 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  production.mysql.com:/usersnfs/jperkin/bk/trees/build/mysql-4.1
 2007-08-02 18:52:42 +02:00
jperkin@production.mysql.com
b088c6a3dc myisamchk.c: 
Fix typo in usage.
 2007-08-02 18:51:11 +02:00
kent@kent-amd64.(none)
b976f18c1b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
 2007-08-02 15:39:34 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
0d9301585b Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b30088/b30088.5.0
 2007-08-02 18:23:23 +05:00
kent@mysql.com/kent-amd64.(none)
74267ad9b8 CMakeLists.txt (several), make_win_bin_dist: 
Aligned client library build and use with the Unix version when it
  comes to what source to include directly in the builds, and what
  libraries to link with (bug#30118).

  Also reviewed, corrected and made more clear when static or dynamic
  Thread Local Storage is to be used. Some code duplication was removed,
  and some redundant library usage were removed, reducing the risk of
  incorrect TLS usage.
 2007-08-02 12:49:27 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
dc84a5fd52 Fix for bug : mysqlbinlog.test: connection_id() not restored under ps-protocol 
Problem: thd->thread_specific_used flag is not set executing a statement
containig connection_id() function using PS protocol, that leads to 
improper binlog event creation.

Fix: set the flag in the Item_func_connection_id::fix_fields().
 2007-08-02 14:51:03 +05:00
joerg@trift2.
69b789aafd Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-08-02 11:18:29 +02:00
tsmith@ramayana.hindu.god
d66b4bd4be Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:41:02 -06:00
tsmith@ramayana.hindu.god
534c3f325d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:39:13 -06:00
tsmith@ramayana.hindu.god
9d09389ccb Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-08-01 18:38:43 -06:00
tsmith@ramayana.hindu.god
181da56554 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:32:39 -06:00
tsmith@ramayana.hindu.god
33c4cdaa66 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:30:55 -06:00
tsmith@ramayana.hindu.god
c2399f04d0 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-08-01 18:30:28 -06:00
tsmith@ramayana.hindu.god
4e20ec041c Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:16:23 -06:00
tsmith@ramayana.hindu.god
8575227571 Merge ramayana.hindu.god:/home/tsmith/m/bk/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
 2007-08-01 18:14:50 -06:00
tsmith@ramayana.hindu.god
ffc2f3ab99 Merge ramayana.hindu.god:/home/tsmith/m/bk/41 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
 2007-08-01 18:12:44 -06:00
ramil/ram@ramil.myoffice.izhnet.ru
f376ea1ba1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b29928.new/b29928.new.5.0
 2007-08-01 19:23:39 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
7fb417d0ba Fix for bug : INSERT ... VALUES(connection_id(), ...) incorrect 
restores from mysqlbinlog out

Problem: using "mysqlbinlog | mysql" for recoveries the connection_id() 
result may differ from what was used when issuing the statement.

Fix: if there is a connection_id() in a statement, write to binlog
SET pseudo_thread_id= XXX; before it and use the value later on.
 2007-08-01 15:27:03 +05:00
jperkin@production.mysql.com
ba3729a63b Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
 2007-08-01 12:09:19 +02:00
jperkin@production.mysql.com
a311c37891 Merge production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint 
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0-maint
 2007-08-01 12:02:35 +02:00
jperkin@production.mysql.com
612fb66de4 Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  production.mysql.com:/usersnfs/jperkin/bk/mysql-4.1-maint
 2007-08-01 11:59:52 +02:00
jperkin@production.mysql.com
f5c8c9a81d Option 6 tries to grant global privileges at the database level 
which does not work.  Removing these attempted privileges makes
this identical to option 5 so remove it completely.  The spirit
of the program appears to be aimed at database privileges, so do
not add another option for granting global privileges as it may
be unexpected.  Fixes bug#14618 (same as previous patch, this
time applied to -maint tree).
 2007-08-01 11:58:25 +02:00
kostja@bodhi.(none)
d0dc51b4f7 Fix an unstable test. It was reliant on the current time. 2007-08-01 12:28:08 +04:00
tnurnberg@sin.intern.azundris.com
661c97a154 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  sin.intern.azundris.com:/home/tnurnberg/10776/50-10776
 2007-08-01 09:32:33 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c62d7528c8 Fix for bug : Can't disable myisam-recover by a value of "". 
- test result.

Problem: we don't proper handle "" value of the --myisam-recover option.

Fix: turn off myisam recovering if --myisam-recover="" is set.
 2007-08-01 11:41:13 +05:00
tnurnberg@sin.intern.azundris.com
8dd4751be9 Bug : Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 
mysqld hasn't been built on AIX with ndb-everything in quite a while.
this allowed a variety of changes to be added that broke the AIX build
for both the GNU and IBM compilers (but the IBM suite in particular).
Changeset lets build to complete on AIX 5.2 for users of the GNU and
the IBM suite both. Tudo bem?
 2007-08-01 04:56:58 +02:00
kostja@bodhi.(none)
1bf318b895 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-07-31 20:03:52 +04:00
evgen@moonbone.local
0233a79321 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  moonbone.local:/mnt/gentoo64/work/24989-bug-5.0-opt-mysql
 2007-07-31 17:43:54 +04:00
evgen@moonbone.local
86c3d95c3c ha_innodb.cc: 
Warning fixed.
 2007-07-31 17:42:48 +04:00