mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19713 commits 2788 branches 343 tags 1.7 GiB
Commit graph

19713 commits

This branch
This branch
All branches
Author SHA1 Message Date
guilhem@mysql.com
11848b53d3 To force a restart at the end of test, the option file must be non-empty, it's not enough if it exists and is empty. 2005-10-12 22:29:36 +02:00
guilhem@mysql.com
ab05c75ea7 merge 2005-10-12 13:31:48 +02:00
guilhem@mysql.com
4c1c9db823 Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc; 
in short we now record whenever the slave I/O thread ignores a master's event because of its server id,
and use this info in the slave SQL thread to advance Exec_master_log_pos. Because if we
do not, this variable stays at the position of the last executed event, i.e. the last *non-ignored*
executed one, which may not be the last of the master's binlog (and so the slave *looks* behind
the master though it's data-wise it's not).
 2005-10-12 13:29:55 +02:00
grog@mysql.com
d1132f0ef1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/users/grog/4.1
 2005-10-12 09:54:20 +02:00
grog@mysql.com
c248a36e30 sql_yacc.yy: 
Bug #10308: Parse 'purge master logs' with subselect correctly.
subselect.test:
  Bug #10308: Test for 'purge master logs' with subselect.
subselect.result:
  Bug #10308: Test result for 'purge master logs' with subselect.
 2005-10-12 09:47:59 +02:00
lenz@mysql.com
c36cf6dbd9 Merge mysql.com:/space/my/mysql-4.1 
into mysql.com:/space/my/mysql-4.1-build
 2005-10-11 22:31:08 +02:00
lenz@mysql.com
9b4ab5931a Merge mysql.com:/space/my/mysql-4.0-build 
into mysql.com:/space/my/mysql-4.1-build
 2005-10-11 21:24:01 +02:00
lenz@mysql.com
8782f5a0e3 - added Docs/manual.chm to the windows source distribution (BUG#13899) 2005-10-11 21:16:08 +02: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
lars@mysql.com
cd0e0a9933 Added missing HAVE_REPLICATION define 2005-10-10 19:23:13 +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
998380521f BUG#12618: Removing fake locking 2005-10-10 15:10:14 +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
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
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
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
joerg@mysql.com
3a32f96e31 Increase the version number. 2005-10-07 12:50:29 +02:00
monty@mysql.com
3f73d25fba Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/my/mysql-4.1
 2005-10-07 04:02:53 +03:00
monty@mysql.com
82855517a1 Review of new code since last pull 
- Use %lx instead of %p as %p is not portable
- Don't replace ROW item with Item_null
 2005-10-07 03:12:15 +03:00
kent@mysql.com
ae62a58817 make_binary_distribution.sh: 
Corrected platform name output
Services.cpp:
  Dont print null address (back port from 5.0)
 2005-10-07 01:56:11 +02:00
kent@mysql.com
87016b438c make_binary_distribution.sh: 
Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable
 2005-10-06 22:57:13 +02:00
dean@mysql.com
dd241c4b8e Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/dellis/mysqlab/bk/mysql-4.1
 2005-10-06 15:42:35 -05:00
kent@mysql.com
52181cc810 make_binary_distribution.sh: 
Replaced --machine with --platform
  General code cleanup
 2005-10-06 18:00:23 +02:00
gluh@mysql.com
a67fcc4669 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/4.1.13605
 2005-10-06 19:58:51 +05:00
gluh@eagle.intranet.mysql.r18.ru
fbc621e545 Fix for bug#13605 'rpl_openssl' test hangs 2005-10-06 19:51:08 +05:00
kent@mysql.com
5e204d46f1 Merge 2005-10-06 15:42:50 +02:00
bar@mysql.com
905c8b8c88 item_cmpfunc.cc: 
Wrong variable.
 2005-10-06 15:26:59 +05:00
pekka@mysql.com
45dcaf968d ndb - prelim perl scripts to autotest 2005-10-06 09:44:25 +02:00
bar@mysql.com
ab2caf6de8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12476
 2005-10-05 17:35:42 +05:00
msvensson@neptunus.(none)
0588cc35f4 Revert 2005-10-05 14:35:41 +02:00
bar@mysql.com
1fb8ea3714 item_cmpfunc.cc: 
wrong variable.
 2005-10-05 17:33:39 +05:00
guilhem@mysql.com
8a291efb75 The "exit" command of mysqltest is quite useful when writing tests for 4.1 so I'm porting it from 5.0 to 4.1. 2005-10-05 12:21:53 +02:00
bar@mysql.com
a98e6dfe44 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b13046
 2005-10-05 11:28:08 +05:00
guilhem@mysql.com
e6043231ea Importing BUILD/compile-pentium64-valgrind-max from 5.0 (unchanged), and speeding up 'bk citool' for me 2005-10-04 22:24:04 +02:00
georg@lmy002.wdf.sap.corp
f846bc32c1 Windows compilation fix: Added typecast (const char* to char *) 2005-10-04 10:54:58 +02:00
marko@hundin.mysql.fi
8732235f85 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  hundin.mysql.fi:/home/marko/mysql-4.1
 2005-10-04 00:21:54 +03:00
marko@hundin.mysql.fi
bf30733840 Merge hundin.mysql.fi:/home/marko/mysql-4.0 
into  hundin.mysql.fi:/home/marko/mysql-4.1
(Bug #13002)
 2005-10-03 17:54:39 +03:00
marko@hundin.mysql.fi
d62b9f4b4b InnoDB: Display an error message in /* */ comments 
in SHOW CREATE TABLE if a temporary file cannot be created.
(Bug #13002)
 2005-10-03 17:46:27 +03:00
msvensson@neptunus.(none)
a4c636a587 Move -ansi flag from global_warnings to cxx_warnings 2005-10-03 16:24:47 +02:00
heikki@hundin.mysql.fi
5dc00e0cac os0sync.c: 
Add diagnostic code to track an assertion failure of 0 == pthread_mutex_destroy(); this was reported on the MySQL mailing list Sept 23, 2005
 2005-10-03 00:05:50 +03:00
marko@hundin.mysql.fi
96d77a34e9 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  hundin.mysql.fi:/home/marko/mysql-4.1
 2005-09-30 16:02:19 +03:00
marko@hundin.mysql.fi
17b0098127 InnoDB: After review fix 2005-09-30 15:06:41 +03:00
kent@mysql.com
21cf818a8d Many files: 
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
 2005-09-30 14:03:55 +02:00
marko@hundin.mysql.fi
8c1ccbc903 InnoDB: On UPDATE, trim UCS2 columns correctly. (Bug #12178) 2005-09-30 13:58:00 +03:00
jonas@perch.ndb.mysql.com
6169d529e5 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-09-30 12:25:46 +02:00
jonas@perch.ndb.mysql.com
f334a14952 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
 2005-09-30 12:24:56 +02:00
jonas@perch.ndb.mysql.com
bb70442366 ndb_config 
Check returnvalue on load/fetch configuration
 2005-09-30 12:22:00 +02:00