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

1646 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
4a0d64af89 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-trigger-5.0
 2005-07-29 23:43:07 +03:00
jimw@mysql.com
4bef050cd4 Merge mysql.com:/home/jimw/my/mysql-5.0-10351 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-29 09:25:11 -07:00
jimw@mysql.com
90924fcb6a Fix for handling of unsigned long options on 32-bit platforms that 
allowed unintended overflows. (Bug #10351)
 2005-07-28 18:22:49 -07:00
bell@sanja.is.com.ua
b220fc47ef store/restore sql_mode which was in force during ctrigger creation (BUG#5891) 
other sql_mode fixes
 2005-07-28 22:39:11 +03:00
jimw@mysql.com
2cb78727f6 Merge mysql.com:/home/jimw/my/mysql-5.0-10351 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-28 10:40:44 -07:00
hf@deer.(none)
faef3a442e Merge deer.(none):/home/hf/work/mysql-4.1.11329 
into deer.(none):/home/hf/work/mysql-5.0.clean
 2005-07-27 13:02:10 +05:00
hf@deer.(none)
a776edbed1 Fix for bug #11329 (lowercase_table.test fails) 2005-07-26 20:59:43 +05:00
jimw@mysql.com
72a6c71d08 Fix value returned from SELECT of unsigned long system 
variables. (Bug #10351)
 2005-07-22 16:18:34 -07:00
jani@a193-229-222-105.elisa-laajakaista.fi
8f10662eab Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
 2005-07-23 00:15:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2657e48c64 Faster alter table code for 5.1. 2005-07-22 23:43:59 +03:00
tulin@dl145b.mysql.com
bf6e3f9aa8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-07-20 07:53:10 +02:00
jimw@mysql.com
2a06e5756e Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 19:59:32 -07:00
jimw@mysql.com
63c6ece728 Cleanups after merge from 4.1. 2005-07-19 16:32:38 -07:00
tulin@dl145b.mysql.com
a6c21a0791 merge 2005-07-19 21:56:10 +02:00
konstantin@mysql.com
e3af1b6ec6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kostja/mysql/mysql-5.0-10760-new
 2005-07-19 22:22:12 +04:00
konstantin@mysql.com
14344b658a A fix and a test case for Bug#10760 and complementary cleanups. 
The idea of the patch
is that every cursor gets its own lock id for table level locking.
Thus cursors are protected from updates performed within the same 
connection. Additionally a list of transient (must be closed at
commit) cursors is maintained and all transient cursors are closed
when necessary. Lastly, this patch adds support for deadlock
timeouts to TLL locking when using cursors.
+ post-review fixes.
 2005-07-19 22:21:12 +04:00
jimw@mysql.com
80c1c6b33f Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 11:05:49 -07:00
dlenev@mysql.com
b141437ad3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-tn
 2005-07-19 20:55:09 +04:00
monty@mishka.local
7e83d09ce7 Simple fixes during review of new code 2005-07-19 19:25:05 +03:00
dlenev@mysql.com
8a3e723b74 Fix for bugs #5892/6182/8751/8758/10994 (based on Antony's patch) 
"Triggers have the wrong namespace"
  "Triggers: duplicate names allowed"
  "Triggers: CREATE TRIGGER does not accept fully qualified names"
  "SHOW TRIGGERS"
 2005-07-19 20:06:49 +04:00
konstantin@mysql.com
52b8928b09 Merge mysql.com:/home/kostja/mysql/mysql-4.1-root 
into  mysql.com:/home/kostja/mysql/mysql-5.0-merge
 2005-07-19 00:55:37 +04:00
gbichot@production.mysql.com
7cd2fb13ff Fix for BUG#12003 "assertion failure in testsuite (double lock of 
LOCK_thread_count)" and for BUG#12004 "SHOW BINARY LOGS reports 0
for the size of all binlogs but the current one".
There are a lot of 4.1->5.0 unmerged changes (hardest are in the optimizer), can't merge; still pushing in 4.1 because my changes 
are very small. Feel free to ask me if you have problems merging them.
 2005-07-18 14:46:53 +02:00
monty@mishka.local
78c65b5adc Cleanups during review 
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (
 2005-07-18 15:33:18 +03:00
mronstrom@mysql.com
67087e2aa7 Patch for push of wl1354 Partitioning 2005-07-18 13:31:02 +02:00
konstantin@mysql.com
8b0adacbc6 After-merge fixes (4.1 -> 5.0). 2005-07-16 16:10:42 +04:00
reggie@linux.site
95a5c8ef49 Merge linux.site:/home/reggie/bk/bug7403 
into  linux.site:/home/reggie/bk/mysql-5.0
 2005-07-15 12:15:45 -06:00
reggie@linux.site
65a1d74fb1 added a comment referring to the bug report 2005-07-15 03:51:55 -06:00
reggie@linux.site
adfa1a2596 Bug #7403 error "Forcing close of thread 1 user: 'xxx'" 
The problem was that on Windows, the socket was in a blocking state 
trying to read.  Setting killed=1 is not enough to break the 
socket out of it's read loop.   You have to cancel the read request
or close the socket (which close_connection does).
 2005-07-14 06:04:29 -06:00
tomas@poseidon.ndb.mysql.com
674b6bb151 Merge 2005-07-12 20:01:22 +02:00
monty@mysql.com
fe30ec9032 manual merge 2005-07-04 03:50:04 +03:00
monty@mysql.com
ec420bfb43 Fixes during review of new code 
- Mostly indentation fixes
- Added missing test
- Ensure that Item_func_case() checks for stack overruns
- Use real_item() instead of (Item_ref*) item
- Fixed wrong error handling
 2005-07-04 03:42:33 +03:00
monty@mysql.com
86d7b02199 Merge with 4.1 2005-07-03 14:17:52 +03:00
jani@ua141d10.elisa.omakaista.fi
b60175f9c4 Fixed Bug#11226 and reverted fix for Bug#6993. 
Using 8 bytes for data pointer does not work at least on
all computers. The result may become 0 or negative number.
(mysqld, myisamchk)
 2005-06-30 16:13:22 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
3df73db1cf Applied some Netware related patches. 2005-06-29 14:02:11 +03:00
jimw@mysql.com
3dd28e98e6 Fix typo in --default-store-engine help. (Bug #11534) 2005-06-27 10:49:40 -07:00
jimw@mysql.com
409592e652 Add my_str_malloc and _free function pointers to strings library 
which will by default exit(1) if malloc() fails, but can be set
to do something else by the calling program does, which mysqld
does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks
allocation in conf_to_src utility program. (Bug #7003)
 2005-06-24 13:41:33 -07:00
ndbdev@dl145b.mysql.com
dcef1c7532 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-22 19:07:29 +02:00
svoj@mysql.com
a8bcb25eda Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
 2005-06-22 14:11:23 +05:00
svoj@mysql.com
74373e7d54 WL#2286 - Compile MySQL w/YASSL support 
Fix GCC 4.0 link failure.
Better CXX_VERSION guessing.
 2005-06-22 14:08:28 +05:00
monty@mishka.local
1524cd001d Cleanup during review of new code 
Fixed wrong allocation that could cause buffer overrun when using join cache
 2005-06-21 18:18:58 +03:00
tulin@dl145b.mysql.com
a6d0581275 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-21 08:49:21 +02:00
marko@hundin.mysql.fi
e992adcb3f Merge hundin.mysql.fi:/home/marko/mysql-5.0 
into hundin.mysql.fi:/home/marko/mysql-5.0-current
 2005-06-21 07:36:18 +03:00
tulin@dl145b.mysql.com
b217fc0692 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-20 12:42:39 +02:00
svoj@mysql.com
c45df76029 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
 2005-06-20 11:33:57 +05:00
svoj@mysql.com
7660f609e6 WL#2286 - Compile MySQL w/YASSL support 
Fix for yaSSL link failures with Forte Developer 7, MIPSpro Compilers, Compaq C++.
These compilers have problem with implicit template instantiation in archives
(libyassl.a, libtaocrypt.a). Instantiate templates explicitly.

Fix for yaSSL link failure on powermacg5 (gcc 3.3). When -O3 is specified gcc inlines
__cxa_pure_virtual. This is wrong behavior, __cxa_pure_virtual must never be inlined.
 2005-06-19 21:46:44 +05:00
tulin@dl145b.mysql.com
07b4a42e18 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-18 09:21:50 +02:00
acurtis@xiphis.org
51dd521dfc Bug#6877 MySQL should give an error if the requested table type is not available 
Implement new SQL mode - NO_ENGINE_SUBSTITUTION
 2005-06-17 22:14:44 +01:00
ndbdev@dl145b.mysql.com
7641b50fb6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
 2005-06-17 08:13:57 +02:00
konstantin@mysql.com
4f966145b0 Post-merge fixes. 2005-06-17 01:58:36 +04:00
konstantin@mysql.com
62dacf0813 Manual merge (4.1->5.0) 2005-06-17 00:34:35 +04:00