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
49123 commits 2793 branches 343 tags 1.5 GiB
Commit graph

49123 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
msvensson@pilot.(none)
6e3a7e0bb6 Update to reflect new location of where log file end up 2007-08-03 13:42:31 +02:00
msvensson@pilot.(none)
f7986a6307 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-03 13:40:38 +02:00
msvensson@pilot.(none)
fecdca6754 Add extra newline between diff and error message 2007-08-03 13:39:55 +02:00
msvensson@pilot.(none)
e4817a3843 Update after merge, change "byte" and "gptr" into "uchar" and "uchar*" 2007-08-03 13:29:30 +02:00
msvensson@pilot.(none)
7afa0163e5 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-03 13:26:43 +02:00
msvensson@pilot.(none)
51abee54c5 Merge 192.168.0.7:mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-03 13:15:03 +02:00
msvensson@shellback.(none)
cc00660f95 WL#3935 Improve mysqltest report and exitcode for diff 
- Move the code to generate test report to the test tool(in this
   case mysqltest) where the best control of what failed is
- Simplify the code in mysql-test-run.pl
- mysqltest will now find what diff to use in a best effort attempt
  using "diff -u", "diff -c" and finally dumping the two files verbatim
  in the report.
 2007-08-03 13:12:53 +02:00
bar@mysql.com/bar.myoffice.izhnet.ru
7754da28f9 After merge fix 2007-08-03 15:57:14 +05:00
msvensson@pilot.(none)
2258a423b2 Merge 192.168.0.7:mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-03 12:57:09 +02:00
msvensson@shellback.(none)
d6f02500af Cleanup created procedures in sp.test 2007-08-03 12:56:45 +02:00
msvensson@shellback.(none)
7e86c5971a Remove the temporary file created by mysql_upgrade 2007-08-03 12:54:06 +02:00
msvensson@pilot.(none)
9e55a4f3b9 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-03 12:52:31 +02:00
msvensson@pilot.(none)
820f53e84b Merge 192.168.0.7:mysql/mtr_log/my50-mtr_log 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-03 12:52:04 +02:00
msvensson@pilot.(none)
ba3c906428 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-03 12:50:36 +02:00
msvensson@pilot.(none)
ea692e9028 Improve report on test execution time 
Define tot_real_tim locally in mtr_report.pl
 2007-08-03 12:50:00 +02:00
msvensson@shellback.(none)
b3db467178 Send output to var/log/mysql-test-run.log to facilitate easier debugging 
of mysql-test-run.pl
 2007-08-03 12:36:32 +02: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
dfischer@bk-internal.mysql.com
74c18252c6 README.txt-1: 
Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-1
README.txt:
  Rename: BitKeeper/deleted/.del-README.txt -> mysql-test/suite/funcs_1/README.txt
README.txt-old-delete:
  Rename: mysql-test/suite/funcs_1/README.txt -> mysql-test/suite/funcs_1/README.txt-old-delete
README.txt:
  Rename: mysql-test/suite/funcs_1/README.txt-1 -> mysql-test/suite/funcs_1/README.txt
.del-README.txt-old-delete:
  Delete: mysql-test/suite/funcs_1/README.txt-old-delete
 2007-08-03 09:52:55 +02:00
joerg@trift2.
88fedd69d5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-03 09:16:12 +02:00
monty@mysql.com/nosik.monty.fi
113cd2d064 Removed compiler warning 2007-08-03 08:08:33 +03:00
cbell/Chuck@mysql_cab_desk.
f42cf05ad4 WL#3228 (NDB) : RBR using different table defs on slave/master 
This patch removes a portion of the last patch to Field_blob::copy
after problems found during testing of tests using distinct operations.
 2007-08-02 21:18:41 -04:00
monty@mysql.com/nosik.monty.fi
237d586700 Simplify logging code a bit (to make code smaller and faster) 
Moved duplicated code to inline function store_timestamp()
Save thd->time_zone_used when logging to table as CSV internally cases it to be changed
Added MYSQL_LOCK_IGNORE_FLUSH to log tables to avoid deadlock in case of flush tables.
Mark log tables with TIMESTAMP_NO_AUTO_SET to avoid automatic timestamping
Set TABLE->no_replicate on open
 2007-08-03 01:14:27 +03:00