mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
26975 commits 2778 branches 343 tags 1.6 GiB
Commit graph

26975 commits

This branch
This branch
All branches
Author SHA1 Message Date
gluh@mysql.com
d19c85199f 4.1->5.0 merge 2005-10-12 11:54:12 +05:00
monty@mysql.com
5513ab69b7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-12 00:59:52 +03:00
monty@mysql.com
f5fdf3e87a Reviewing new pushed code 
- CHAR() now returns binary string as default
- CHAR(X*65536+Y*256+Z) is now equal to CHAR(X,Y,Z) independent of the character set for CHAR()
- Test for both ETIMEDOUT and ETIME from pthread_cond_timedwait()
  (Some old systems returns ETIME and it's safer to test for both values
   than to try to write a wrapper for each old system)
- Fixed new introduced bug in NOT BETWEEN X and X
- Ensure we call commit_by_xid or rollback_by_xid for all engines, even if one engine has failed
- Use octet2hex() for all conversion of string to hex
- Simplify and optimize code
 2005-10-12 00:58:22 +03:00
evgen@moonbone.local
38a470794d Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13327-bug-5.0-mysql
 2005-10-12 00:12:54 +04:00
evgen@moonbone.local
50361f8b00 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/13327-bug-5.0-mysql
 2005-10-11 23:31:32 +04:00
eric@mysql.com
6c80672c8a Merge eherman@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/eric/dev/mysql-5.0
 2005-10-11 09:13:27 -07:00
jimw@mysql.com
de8b29cd0e Merge mysql.com:/home/jimw/my/mysql-5.0-13650 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-10-11 08:40:23 -07:00
bar@mysql.com
bb179f2376 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-11 17:03:41 +05:00
bar@mysql.com
d99146ce2c complete.c: 
Fixed compilation problem on FreeBSD,
  after discussion with Jani.
  Doesn't FreeBSD follow the standard?
 2005-10-11 16:56:42 +05:00
hf@deer.(none)
cb7d5f4488 Merging 2005-10-11 16:39:35 +05:00
gluh@eagle.intranet.mysql.r18.ru
8d01ea1be7 Fix for bug#9270 multiple SSL race conditions (for 5.0 tree) 
The fix is needed to perform locking on shared data structures
  This is modification of patch proposed by Leandro Santi
  (see http://webs.sinectis.com.ar/lesanti/misc/mysql-4.0.23a-openssl_locking.patch)
 2005-10-11 16:26:00 +05:00
hf@deer.(none)
be0917049b Merging 2005-10-11 14:58:25 +05:00
eric@mysql.com
215ecd3322 BUG#13724 conditionally added CONNECTION='connect string' for SHOW CREATE TABLE 2005-10-10 17:41:36 -07:00
lars@mysql.com
bef189cc4e Merge lthalmann@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/users/lthalmann/bkroot/mysql-5.0
 2005-10-10 21:52:50 +02:00
lars@mysql.com
5456afc603 Added missing HAVE_REPLICATION define 2005-10-10 21:42:14 +02:00
svoj@mysql.com
3d0082d3b0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/svoj/devel/mysql/engine/mysql-5.0
 2005-10-11 00:35:09 +05:00
svoj@mysql.com
83043c3c83 Always save/restore connect string. 2005-10-10 23:53:53 +05:00
svoj@mysql.com
eb8ab30046 Store and read engine type string in extra block of .frm. 2005-10-10 23:01:45 +05:00
lars@mysql.com
af951aa662 After merge fixes 2005-10-10 19:38:58 +02:00
lars@mysql.com
cd0e0a9933 Added missing HAVE_REPLICATION define 2005-10-10 19:23:13 +02:00
lars@mysql.com
94169d9324 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2005-10-10 18:34:35 +02:00
hf@deer.(none)
83c103ed81 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.13372
 2005-10-10 21:09:34 +05:00
lars@mysql.com
57f36732ca Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2005-10-10 17:50:19 +02:00
tulin@dl145b.mysql.com
bdf57377aa fixed init of variables in ndb block constructors 2005-10-10 17:09:27 +02:00
evgen@moonbone.local
65325ecbbb Fix bug#13327 check_equality() wasn't checking view's fields 
check_equality() finds equalities among field items. It checks input items
to be Item_fields thus skipping view's fields, which are represented by
Item_direct_view_ref. Because of this index wasn't applied in all cases
it can be.

To fix this problem check_equality() now takes real item of
Item_direct_view_ref, except outer view refs (with depended_from set).
 2005-10-10 18:53:57 +04:00
lars@mysql.com
998380521f BUG#12618: Removing fake locking 2005-10-10 15:10:14 +02:00
lenz@mysql.com
0b80982497 - typo fix: rott->root in the file attributes for mysql_client_test of the RPM spec file 2005-10-10 13:00:41 +02:00
tomas@poseidon.ndb.mysql.com
e8f291f52b Bug #13611 double [TCP DEFAULT] in config.ini crashes ndb_mgmd 
- Added error printout and nice exit for duplicate default sections
 2005-10-10 12:27:48 +02:00
tomas@poseidon.ndb.mysql.com
d8640ca222 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-10-10 09:38:18 +02:00
konstantin@mysql.com
2c7505b263 Remove protocol_cursor.cpp (no longer used) from sources 
Fix a compile failure
 2005-10-09 14:45:08 +04:00
serg@serg.mylan
ba169f81e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-08 16:59:41 +02:00
serg@serg.mylan
da625424e0 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-10-08 16:59:08 +02:00
serg@serg.mylan
510d5c3583 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-10-08 16:56:10 +02:00
serg@serg.mylan
e91712d9bb pthread_handler_decl() changed to be ctags-friendly 
(and contain extern "C" when necessary)
 2005-10-08 16:39:55 +02:00
serg@serg.mylan
ae293f9ac5 Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE" 
don't allow STOP SLAVE if global read lock is in taken
 2005-10-08 14:46:04 +02:00
monty@mysql.com
17d7ba931d Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2005-10-08 03:37:23 +03:00
monty@mysql.com
f577ebb88f Simple changes during review of code 
Added back flag that I accidently removed in last patch
 2005-10-08 00:57:40 +03:00
petr@mysql.com
dad1e2048d Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/trees/mysql-5.0
 2005-10-07 20:40:09 +04:00
petr@mysql.com
54db9bab7c fix compile failure (which shows up in cygwin environment) 2005-10-07 20:25:51 +04:00
tomas@poseidon.ndb.mysql.com
6844fea57a added missing signal to VoidFs 2005-10-07 17:43:59 +02:00
ramil@mysql.com
e27a831506 Merge mysqldev@production.mysql.com:my/mysql-4.1-release 
into  mysql.com:/usr/home/ram/work/mysql-4.1
 2005-10-07 20:34:40 +05:00
ramil@mysql.com
fcc51afb6a Populate t1 in order to get more predictable explain results. 2005-10-07 20:14:34 +05:00
joerg@mysql.com
01a374d955 Copy zlib.a and valgrind.supp if exists. 
Copy disabled.def
(Backport of Kent's change from the main tree to the 4.1.15 build clone.
Original changeset:  2005/10/07 13:08:07+02:00 kent@mysql.com )
 2005-10-07 16:37:53 +02:00
kent@mysql.com
33f38f7ed8 make_binary_distribution.sh: 
Copy zlib.a and valgrind.supp if exists
  Copy disabled.def
 2005-10-07 13:08:07 +02:00
kent@mysql.com
c68c4f3cb7 Merge 2005-10-07 12:55:00 +02:00
joerg@mysql.com
3a32f96e31 Increase the version number. 2005-10-07 12:50:29 +02:00
gluh@eagle.intranet.mysql.r18.ru
a31a4d4b9b after merge fix 2005-10-07 15:09:44 +05:00
gluh@mysql.com
041eab4663 4.1 -> 5.0 merge 2005-10-07 14:26:32 +05:00
gluh@eagle.intranet.mysql.r18.ru
b2b8d8b276 Fix for bug#13202 SELECT * INTO OUTFILE ... FROM information_schema.schemata now fails 
allow select into outfile from I_S tables
  it is enough to add FILE_ACL for I_S tables only to 'check_table_access' function
  as we use 'any_db' for 'check_access' function in places where FILE_ACL is required
 2005-10-07 14:16:44 +05:00
sergefp@mysql.com
140dea1426 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug13484
 2005-10-07 11:14:40 +04:00