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

53286 commits

This branch
This branch
All branches
Author SHA1 Message Date
davi@endora.local
d5847eb112 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2008-02-19 10:39:14 -03:00
davi@endora.local
84a0d7c507 Merge mysql.com:/Users/davi/mysql/bugs/23771-5.1 
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
 2008-02-19 10:36:31 -03:00
vvaintroub@wva.
b609c158d8 Post-merge fix 2008-02-19 14:25:26 +01:00
vvaintroub@wva.
efa91b5479 Merge wva.:C:/bk/bug31745_2/my51_31754_2/..\my50-bug31745_2 
into  wva.:C:/bk/bug31745_2/my51_31754_2
 2008-02-19 14:20:46 +01:00
kostja@dipika.(none)
72495c968b Rename send_eof() to my_eof() for consistency with my_ok() and my_error() 2008-02-19 15:58:08 +03:00
kostja@dipika.(none)
f106d9738a Rename send_ok to my_ok. Similarly to my_error, it only records the status, 
does not send it to the client.
 2008-02-19 15:45:21 +03:00
kostja@dipika.(none)
d8e6308c42 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  dipika.(none):/opt/local/work/mysql-5.1-2pc-opt-merge-push
 2008-02-19 14:53:22 +03:00
kostja@dipika.(none)
acf9b1f346 A fix and a test case for Bug#12713 "Error in a stored function called from 
a SELECT doesn't cause ROLLBACK of statem".

The idea of the fix is to ensure that we always commit the current
statement at the end of dispatch_command(). In order to not issue
redundant disc syncs, an optimization of the two-phase commit
protocol is implemented to bypass the two phase commit if
the transaction is read-only.
 2008-02-19 14:43:01 +03:00
vvaintroub@wva.
f5932c0d95 Bug#31745 - crash handler does not work on Windows 
- Replace per-thread signal()'s with  SetUnhandledExceptionFilter(). 
  The only remaining signal() is for SIGABRT (default abort()
  handler in VS2005 is broken, i.e removes user exception filter)
- remove MessageBox()'es  from error handling code
- Windows port for print_stacktrace() and write_core() 
- Cleanup, removed some unused functions
 2008-02-19 12:37:39 +01:00
mkindahl@dl145h.mysql.com
446c3768f5 Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2008-02-19 11:07:14 +01:00
msvensson@pilot.mysql.com
bf98940d6b Revert change to check proper return value from QueryPerformanceFrequency 
since it will be change in other patch
 2008-02-19 09:36:28 +01:00
guilhem@gbichot4.local
045f3c4a5d Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  gbichot4.local:/home/mysql_src/mysql-5.1-build-gca
 2008-02-18 23:36:57 +01:00
guilhem@gbichot4.local
9e2b31b026 Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name> 
value" error even though the value was correct): a C function in my_getopt.c
was taking bool* in parameter and was called from C++ sql_plugin.cc,
but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny
mismatches. Fixed, all other occurences of bool in C are removed, future
ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool).
 2008-02-18 23:29:39 +01:00
tsmith@ramayana.hindu.god
a6d50c102c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-02-18 12:25:31 -07:00
tsmith@ramayana.hindu.god
732eb0b4ce Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-02-18 12:18:36 -07:00
tsmith@ramayana.hindu.god
71faa39360 Merge ramayana.hindu.god:/home/tsmith/m/bk/50-b28555 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2008-02-18 12:04:54 -07:00
tsmith@ramayana.hindu.god
958f615f36 Merge ramayana.hindu.god:/home/tsmith/m/bk/b21158/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2008-02-18 12:04:22 -07:00
tsmith@ramayana.hindu.god
69dcac5a7e Bug #28555 Upgrading MySQL Fails to shut down old server and kills socket file 
Check for an existing MySQL server package from a different vendor or
major MySQL version.  In such a case, refuse to install the server and
recommend how to safely remove the old packages before installing the
new ones.
 2008-02-18 12:03:39 -07:00
tsmith@ramayana.hindu.god
845b94451f Bug #28460 mysqlhotcopy silently skips a database with two alphanumerics name 
Remove code from mysqlhotcopy which deals with the so-called "RAID"
feature of older MyISAM.
 2008-02-18 11:48:33 -07:00
kent@kent-amd64.(none)
6761108f29 Merge mysql.com:/home/kent/bk/maria/mysql-maria-gca 
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
 2008-02-18 16:23:00 +01:00
anozdrin/alik@quad.
f4659b38af Merge quad.:/mnt/raid/alik/MySQL/devel/5.1 
into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2008-02-18 18:12:37 +03:00
anozdrin/alik@quad.
48058cf10b Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rt 
into  quad.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged
 2008-02-18 18:12:05 +03:00
sven@riska.(none)
4cf7508380 Fixed broken result file. 2008-02-18 15:48:17 +01:00
mkindahl@dl145h.mysql.com
896fceec81 Updating result files. 2008-02-18 15:16:39 +01:00
kent@mysql.com/kent-amd64.(none)
5d3d61f459 CMakeLists.txt: 
Missing "sql_profile.cc" was added
 2008-02-18 14:46:47 +01:00
mkindahl@dl145h.mysql.com
d277f9344f Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
 2008-02-15 17:51:35 +01:00
mkindahl@dl145h.mysql.com
c5273c1759 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl 
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
 2008-02-15 17:49:05 +01:00
sven@riska.(none)
ec9c79138f Merge ssandberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 
into  riska.(none):/home/sven/bktip/5.1-new-rpl
 2008-02-15 14:34:13 +01:00
sven@riska.(none)
b19d948e8a Problem: After I moved rpl/t/rpl_variables.test into t/variables.test, 
t/variables.test fails on embedded server. Moved out that part again, to
a new test called t/variables-notembedded.test.
 2008-02-15 12:54:04 +00:00
mats@kindahl-laptop.dnsalias.net
c4b58c971c Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl 
into  kindahl-laptop.dnsalias.net:/home/bk/b34458-mysql-5.1-rpl
 2008-02-15 13:10:13 +01:00
mats@kindahl-laptop.dnsalias.net
89e2fe8c05 Bug #34458 Extreneous use of templates in server code 
Patch to remove white-space left over after removing anonymous
namespace.
 2008-02-15 13:06:28 +01:00
mats@kindahl-laptop.dnsalias.net
25dc9eb10b Bug #34458 Extreneous use of templates in server code 
Replacing a template function with a normal static function.
The template parameter, which previously was the class to
find a binlogging function in, is now passed as a pointer to
the actual binlogging function instead.

The patch requires change of indention, but that is submitted
as a separate patch.
 2008-02-15 12:56:44 +01:00
anozdrin/alik@quad.
b25de63309 Add a test case for Bug#21704: Renaming column does not update 
FK definition.
 2008-02-15 14:14:09 +03:00
bar@bar.myoffice.izhnet.ru
fd97a07758 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b27877
 2008-02-15 14:58:58 +04:00
mkindahl@dl145h.mysql.com
a1a94e238f Adding waits to events_scheduling to prevent the test from 
failing on heavily loaded systems.
 2008-02-15 10:24:13 +01:00
aelkin/andrei@mysql1000.dsl.inet.fi
416001d8ed Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/5.0-bug33931-assert_write_ignored_ev_when_init_slave_fails
 2008-02-14 21:38:30 +02:00
pcrews@pcrews-mac-local.local
0a62b5584c Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/34468/mysql-5.1-build-34468
 2008-02-14 11:54:56 -05:00
anozdrin/alik@quad.
6bf1306b13 A patch for Bug#18834: ALTER TABLE ADD INDEX on table with 
two timestamp fields.
  
The actual problem here was that CREATE TABLE allowed zero
date as a default value for a TIMESTAMP column in NO_ZERO_DATE mode.
  
The thing is that for TIMESTAMP date type specific rule is applied:
  column_name TIMESTAMP == column_name TIMESTAMP DEFAULT 0
whever for any other date data type
  column_name TYPE == column_name TYPE DEFAULT NULL
  
The fix is to raise an error when we're in NO_ZERO_DATE mode and
there is TIMESTAMP column w/o default value.
 2008-02-14 18:13:40 +03:00
aelkin/andrei@mysql1000.dsl.inet.fi
871eb3e5ad bug#33329 extraneous ROLLBACK in binlog on connection does not use trans tables 
changes for an assert and an updated results file.
 2008-02-14 16:28:32 +02:00
pcrews@pcrews-mac-local.local
dd71e64ae7 Bug#34468 - csv_not_null fails 
Altered test to expect error on UPDATE SET <not_null_col> = NULL instead
of expecting warning and re-recorded .result file.
 2008-02-14 08:17:47 -05:00
aelkin/andrei@mysql1000.dsl.inet.fi
f5fe34dcd1 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  mysql1000.dsl.inet.fi:/home/andrei/MySQL/MERGE/5.0-bug33931-assert_write_ignored_ev_when_init_slave_fails
 2008-02-14 13:55:11 +02:00
mkindahl@dl145h.mysql.com
fd5d7fa761 Fixing test rpl_events to not give false failures. 2008-02-14 10:53:12 +01:00
mkindahl@dl145h.mysql.com
8906700e13 Fixes to try to handle valgrind warnings identical to those in 
BUG#24387, which is closed since long.
 2008-02-14 09:53:01 +01:00
tsmith@ramayana.hindu.god
cd6e2ad99f Bug #21158 mysql_config doesn't include -lmygcc 
Add -lmygcc to mysql_config output for libs, libs_r, and embedded_libs.

Required when linking against our static libs, if yassl is used, and gcc
used to build library is significantly different from that which is using
the library.
 2008-02-14 01:05:25 -07:00
tomas@poseidon.bredbandsbolaget.se
fe9ee5c7bf correct merge error 2008-02-14 00:02:25 +01:00
tomas@poseidon.bredbandsbolaget.se
be0324b005 correct manual merge 2008-02-13 23:10:47 +01:00
tomas@poseidon.bredbandsbolaget.se
1414ba3aed Merge poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-rpl-merge 
into  poseidon.bredbandsbolaget.se:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-13 20:59:55 +01:00
tomas@poseidon.bredbandsbolaget.se
3f95d153f6 correction of merge 2008-02-13 20:52:01 +01:00
sven@riska.(none)
95fab95f9b BUG#32991: Races in mysqldump.test (or mysqldump.test fails sporadically) 
This is *not* a fix to the bug. I'm only disabling the failing part of
mysqldump.test until the bug is fixed. Whoever fixes it, please re-enable
the test.
 2008-02-13 17:39:23 +01:00
joerg@trift2.
cc72fa880e Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2008-02-13 17:08:48 +01:00