database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity
54,780 Commits 3,276 Branches 1,097 Tags
bbf344b646005c6fadeb718bc60f811cf8a42cb5
Commit Graph

22318 Commits

Author SHA1 Message Date
omer@linux.site
36ff199535 Updated funcs_1 test and result files (not including cluster) for 5.1.21 2007-08-06 18:46:00 -07:00
tsmith@ramayana.hindu.god
2073c488af Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-06 16:34:30 -06:00
skozlov/ksm@virtop.localdomain
48c5305808 Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
 2007-08-06 21:41:13 +04:00
gkodinov/kgeorge@magare.gmz
0ac8d08959 Bug 29536 : error message changed 5.0-opt -> 5.1-opt 2007-08-06 06:55:50 -07:00
gkodinov/kgeorge@magare.gmz
5068ebc1c5 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/autopush/B29536-5.0-opt
 2007-08-06 06:37:05 -07:00
gkodinov/kgeorge@magare.gmz
5af5954ab5 Merge magare.gmz:/home/kgeorge/mysql/work/B29536-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt
 2007-08-06 06:34:21 -07: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
cmiller@zippy.cornsilk.net
869da2dd55 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-08-06 08:17:49 -04:00
gkodinov/kgeorge@magare.gmz
117c3ff9d7 Bug #29536: timestamp inconsistent in replication around 1970 
MySQL replicates the time zone only when operations that involve
it are performed. This is controlled by a flag. But this flag
is set only on successful operation.
The flag must be set also when there is an error that involves
a timezone (so the master would replicate the error to the slaves). 

Fixed by moving the setting of the flag before the operation
(so it apples to errors as well).
 2007-08-06 04:57:28 -07:00
msvensson@shellback.(none)
b8a2161673 Remove NOT_YET code 
Update comments
Add more tests for "let from query"
 2007-08-06 11:20:36 +02:00
igor@olga.mysql.com
46c29c8797 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/mysql-5.1-opt
 2007-08-06 01:08:28 -07:00
igor@olga.mysql.com
b8e85da37b Removed a query from the test case for bug 39219 that displayed in valgrind 
a problem for BIT type values different from the one reported for the bug.
 2007-08-06 01:01:22 -07:00
msvensson@shellback.(none)
5fdd29e3d1 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-08-06 09:41:24 +02:00
igor@olga.mysql.com
676c5ef471 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug30219
 2007-08-05 18:39:12 -07: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
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
igor@olga.mysql.com
a8debc6503 Merge olga.mysql.com:/home/igor/mysql-5.0-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30219
 2007-08-05 14:21:36 -07:00
igor@olga.mysql.com
5f6df1b232 Fix bug #30219. 
This bug manifested itself for queries with grouping by columns of
the BIT type. It led to wrong comparisons of bit-field values and
wrong result sets.
Bit-field values never cannot be compared as binary values. Yet
the class Field_bit had an implementation of the cmp method that
compared bit-fields values as binary values. 
Also the get_image and set_image methods of the base class Field 
cannot be used for objects of the Field_bit class. 
Now these methods are declared as virtual and specific implementations
of the methods are provided for the class Field_bit.
 2007-08-05 14:16:49 -07:00
gkodinov/kgeorge@magare.gmz
e53af13d1e rpl_row_tabledefs_2myisam.result: 
merged 5.1-main to 5.1-opt : error numbers changed.
Many files:
   merged 5.1-main to 5.1-opt : error numbers changed
rpl_extraCol_innodb.result:
  merged 5.1-main to 5.1-opt : error numbers changed
 2007-08-05 14:02:33 +03: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
igor@olga.mysql.com
a5e4e70100 Merge olga.mysql.com:/home/igor/mysql-5.1 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge
 2007-08-04 22:36:54 -07:00
igor@olga.mysql.com
d9373125e1 Merge olga.mysql.com:/home/igor/mysql-5.0 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-merge
 2007-08-04 20:53:26 -07:00
igor@olga.mysql.com
e39d06e7d3 Made the test case for bug 28404 platform independent. 2007-08-04 17:15:33 -07:00
igor@olga.mysql.com
3b1dd15e0d Made sure that the test case for bug 28404 use the correct statistics. 2007-08-04 13:41:01 -07:00
igor@olga.mysql.com
4acba86e59 Post-merge fix. 2007-08-04 03:12:43 -07: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
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
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)
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
igor@olga.mysql.com
9c09b7d523 Merge olga.mysql.com:/home/igor/mysql-5.1-opt 
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug28404
 2007-08-03 08:46:01 -07: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
gkodinov/kgeorge@magare.gmz
b2661dd379 Merge magare.gmz:/home/kgeorge/mysql/work/B25228-5.0-opt 
into  magare.gmz:/home/kgeorge/mysql/work/B25228-5.1-opt
 2007-08-03 15:44:40 +03: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)
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
gkodinov/kgeorge@magare.gmz
2bfbe2cd84 Bug #25228: rpl_relayspace.test fails on powermacg5, vm-win2003-32-a 
A test case was waiting for a fixed number of seconds for a specific 
state of the slave IO thread to take place.
Fixed by waiting in a loop for that specific thread state instead 
(or timeout).
 2007-08-03 14:14:33 +03: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@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
skozlov/ksm@virtop.localdomain
ba2e666e6c Merge skozlov@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl
 2007-08-03 14:45:26 +04:00