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

48969 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.(none)
66b74f6a33 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-07 11:42:14 +02:00
msvensson@pilot.(none)
f785bf00de Bug#20037 mysqltest requires cygwin on windows(part 1, new mysqltest commands) 
- Update comments
 - Make "write_file" fail if file already exist
 - Remove temporary files created by test cases
 2007-08-07 11:40:03 +02:00
msvensson@pilot.(none)
35503e7678 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-06 15:14:11 +02:00
dkatz@damien-katzs-computer.local
a933f28a93 Bug #29804 UDF parameters don't contain correct string length 
Previously, UDF *_init functions were passed constant strings with erroneous lengths.
The length came from the containing variable's size, not the length of the value itself.

Now the *_init functions get the constant as a null terminated string with the correct
length supplied.
 2007-08-05 21:37:55 -04:00
dkatz@damien-katzs-computer.local
3fe2098964 Merge dkatz@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  damien-katzs-computer.local:/Users/dkatz/mysql51
 2007-08-05 21:08:08 -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
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
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
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
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
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e8eaca54a3 After-merge fix: result adjusted. 2007-08-02 17:14:48 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
7512856c31 Merge mysql.com:/home/ram/work/b30088/b30088.5.0 
into  mysql.com:/home/ram/work/b30088/b30088.5.1
 2007-08-02 16:56:32 +05:00
ramil/ram@ramil.myoffice.izhnet.ru
54ddf93240 Merge mysql.com:/home/ram/work/b30200/b30200.5.0 
into  mysql.com:/home/ram/work/b30200/b30200.5.1
 2007-08-02 15:26:52 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
dc84a5fd52 Fix for bug #30200: 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
tsmith@ramayana.hindu.god
0f6f44424f Post-merge fix. Update some test results, and add an InnoDB-only 
compatibility hook, thd_mark_transaction_to_rollback().
 2007-08-02 02:22:31 -06:00
tsmith@ramayana.hindu.god
b13de9343f Merge 50 -> 51 (-opt changesets) 2007-08-01 18:59:41 -06: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
a52a078f75 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:40: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
76366d7931 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:33:07 -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
7509e1ed24 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:32:01 -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
c215bd28c1 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:19: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
9ce717b0fe Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 18:15:24 -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
tsmith@ramayana.hindu.god
54254530ad Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51
 2007-08-01 17:34:20 -06:00
tsmith@ramayana.hindu.god
8143040683 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-01 17:32:37 -06:00
tsmith@ramayana.hindu.god
ed880ad21c Remove some redundant or unused code from InnoDB (feedback from 
Marko after applying latest snapshot).
 2007-08-01 16:45:55 -06:00
kostja@bodhi.(none)
2459558060 Fix a valgrind warning. For some reason it never popped up before. 2007-08-01 22:40:04 +04:00
joerg@trift2.
e885a589b0 Merge trift2.:/MySQL/M51/funcs2-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2007-08-01 16:28:03 +02: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