mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49252 commits 2781 branches 343 tags 1.6 GiB
Commit graph

49252 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@pilot.(none)
40bcf44eff Merge pilot.(none):/data/msvensson/mysql/work/my50-work 
into  pilot.(none):/data/msvensson/mysql/work/my51-work
 2007-08-13 15:48:26 +02:00
msvensson@pilot.(none)
51580c6405 Improve error messages 
Write test results to var/log
Add test for "source" and variable expansion
 2007-08-13 15:46:11 +02:00
msvensson@pilot.(none)
02419588a4 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-13 11:35:10 +02:00
msvensson@pilot.(none)
cee0fe85ac Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-13 11:29:58 +02:00
skozlov/ksm@virtop.localdomain
866aa75617 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-13 13:03:33 +04:00
msvensson@pilot.(none)
732356b152 Bug#29804 UDF parameters don't contain correct string length 
- Export 'check_const_len_init' from udf_example.dll
 2007-08-13 09:46:09 +02:00
gshchepa/uchum@gleb.loc
3368d2fb6b Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-11 03:37:43 +05:00
jmiller/ndbdev@ndb08.mysql.com
57df03de46 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql.com:/data2/mysql-5.1-new-rpl-30128-30209
 2007-08-11 00:08:00 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
cc5c5bed9c rpl_packet.test: 
Changed patch to Mats suggestion from review. Patch is for Bug#30209
.del-wait_for_slave_running_off.inc:
  Delete: mysql-test/include/wait_for_slave_running_off.inc
 2007-08-11 00:07:11 +02:00
gshchepa/uchum@gleb.loc
db6ec3f71f Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-11 02:00:51 +05:00
gshchepa/uchum@gleb.loc
c04f57ccef Merge gleb.loc:/home/uchum/work/bk/5.0 
into  gleb.loc:/home/uchum/work/bk/5.0-opt
 2007-08-11 01:32:04 +05:00
gshchepa/uchum@gleb.loc
1b70ffee32 Merge gleb.loc:/home/uchum/work/bk/5.0-opt 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-11 01:27:06 +05:00
cbell/Chuck@mysql_cab_desk.
6497bd2f9e Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
 2007-08-10 15:15:20 -04:00
cbell/Chuck@mysql_cab_desk.
08282643ab Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_22086
 2007-08-10 14:58:46 -04:00
cbell/Chuck@mysql_cab_desk.
e8ea4b84c0 BUG#22086 : Extra Slave Col: Char(5) on slave and Char(10) on master cause mysqld crash 
This patch adds functionality to row-based replication to ensure the
slave's column sizes are >= to that of the master.

It also includes some refactoring for the code from WL#3228.
 2007-08-10 12:48:01 -04:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
2ba264d812 rpl_packet.test: 
Updated test to use new include function
wait_for_slave_running_off.inc:
  Created new include to resolve the timing issue recorded by Bug#30209
rpl_events.inc:
  The issue shown in Bug#30128 is that 'from er' shows up in a part of the test that it should not show up in. This event really is not created until later in the test, yet since the test runs row and then turns around and runs statement, I am guessing that the first run may not have cleaned up like it should, so I am adding a sync with master after the drop of table t1 to ensure that both master and slave are clean.
 2007-08-09 23:18:44 +02:00
msvensson@pilot.(none)
62102f54a2 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/my51-bug29804
 2007-08-09 10:37:50 +02:00
msvensson@pilot.(none)
9d06483f72 Bug#29804 UDF parameters don't contain correct string length 
- Fix warnings
 - Export 'check_const_len' from udf_example.dll
 2007-08-09 10:21:28 +02:00
skozlov/ksm@virtop.localdomain
271178ce70 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-08 21:27:58 +04:00
cmiller@zippy.cornsilk.net
867ae4ccc4 Correct bad merge, and remove version numbers from test case. 2007-08-08 12:21:04 -04:00
msvensson@pilot.(none)
55c448bc1b Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-08 18:09:21 +02:00
msvensson@pilot.(none)
179cd4e016 Merge 192.168.0.7:mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-08 18:03:56 +02:00
msvensson@shellback.(none)
6d2f738ff9 Don't require a space between "if" and "(". This should 
also fix "while" and "connect"
It's now possible to write "if("
 2007-08-08 18:03:44 +02:00
msvensson@pilot.(none)
24666e55cf Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-08 16:49:15 +02:00
msvensson@pilot.(none)
a2f59d74f4 Merge 192.168.0.7:mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-08 16:47:35 +02:00
msvensson@shellback.(none)
792ac3fdcd Use "create_temp_file" to create a temporary file name for the perl script 2007-08-08 16:45:18 +02:00
msvensson@shellback.(none)
87f81bce4e Remove extra newline added to files created by write_file and append_file 2007-08-08 16:44:01 +02:00
msvensson@pilot.(none)
a5eab2c65f Remove file before writing to it. 2007-08-08 16:39:13 +02:00
kostja@bodhi.(none)
3ecef8c0b9 A fix for Bug#28830 Test case log_state fails on VMWare Windows clone due to loaded system 2007-08-08 15:49:19 +04:00
kostja@bodhi.(none)
a3b210d408 Apply patch for Bug#27806 table comments not passed in to storage engine 
during "CREATE ... LIKE ..."
Only affects engine writers.
No change in server behaviour.
 2007-08-08 14:02:07 +04:00
msvensson@pilot.(none)
5e4b4ca6ab Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-08 10:05:09 +02:00
msvensson@pilot.(none)
912aad3b2e Improve comments and log messages in lib/mtr_timer.pl 2007-08-08 10:04:26 +02:00
kostja@bodhi.(none)
b4eb961fef Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-08-08 11:45:13 +04:00
kostja@bodhi.(none)
28f1f1828d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-08-08 11:36:55 +04:00
kostja@bodhi.(none)
3c6eb0002d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
 2007-08-08 11:34:35 +04:00
msvensson@pilot.(none)
8d8123341b Fix warning 2007-08-08 09:31:45 +02:00
bar@bar.myoffice.izhnet.ru
2be7a90a9a Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28875v2 
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl
 2007-08-07 19:30:23 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
7269c6cc6c Reversing additional change suggested by Serg 
under terms of bug#28875 for better performance.
The change appeared to require more changes in item_cmpfunc.cc,
which is dangerous in 5.0.
    
Conversion between a latin1 column and an ascii string constant
stopped to work.
 2007-08-07 19:25:45 +05:00
cmiller@zippy.cornsilk.net
cdc03f7a19 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-08-07 06:53:40 -04:00
cmiller@zippy.cornsilk.net
c2df7e082a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my50-bug27562 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-08-07 06:52:34 -04:00
cmiller@zippy.cornsilk.net
da83da434c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my51-bug27562 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-08-07 06:49:58 -04:00
cmiller@zippy.cornsilk.net
e0139d23d9 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-07 06:48:46 -04:00
cmiller@zippy.cornsilk.net
1380fb167d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my50-bug27562 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug27562/my51-bug27562
 2007-08-07 06:22:52 -04:00
msvensson@pilot.(none)
a7ba7109c7 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-07 12:15:19 +02:00
msvensson@pilot.(none)
7c0341376d Merge 192.168.0.7:mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-07 11:58:00 +02:00
msvensson@shellback.(none)
86658784a1 Bug#29547 mysql-test-run to retrieve warnings for failed command 
- Run "SHOW WARNINGS" when mysqltest fails and display all but the
   last warning(since it's the same as "last error") on stderr
 - Fix typo
 2007-08-07 11:56:30 +02:00
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
cmiller@zippy.cornsilk.net
0221888e39 Bug#27562: ascii.xml invalid? 
Two character mappings were way off (backtick and tilde were "E"
and "Y"!), and three others were slightly rotated.  The first 
would cause collisions, and the latter was probably benign.

Now, assign the character mappings exactly to their normal values.
 2007-08-07 05:35:20 -04: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