mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27305 commits 2791 branches 343 tags 1.7 GiB
Commit graph

13000 commits

Author SHA1 Message Date
jimw@mysql.com
701a137844 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 16:07:16 -07:00
guilhem@mysql.com
a6ceb59491 fixes after merge of 4.1. 2005-10-13 00:29:23 +02:00
lars@mysql.com
082a0bc46c Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-10-12 23:40:54 +02:00
lars@mysql.com
48457e0852 mysqlbin --hexdump patch 3 2005-10-12 23:37:21 +02:00
guilhem@mysql.com
fb3506f370 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-10-12 23:36:41 +02:00
evgen@moonbone.local
fb0074a6ad Manual merged 2005-10-13 01:14:58 +04:00
evgen@moonbone.local
551961b207 select.test, sql_select.cc, sql_lex.cc, item.cc: 
Bug #7672 after merge fix
 2005-10-13 00:58:59 +04:00
jimw@mysql.com
cb0d8aba46 Merge mysql.com:/home/jimw/my/mysql-4.1-8731b 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:28:46 -07:00
jimw@mysql.com
626c8a1c8c Merge mysql.com:/home/jimw/my/mysql-4.1-13344 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:27:49 -07:00
jimw@mysql.com
6a19058c55 Merge mysql.com:/home/jimw/my/mysql-4.1-13619 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:26:49 -07:00
evgen@moonbone.local
902b06ecb1 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13535-bug-4.1-mysql
 2005-10-13 00:16:33 +04:00
guilhem@mysql.com
4252b546b3 Merge mysql.com:/home/mysql_src/mysql-4.1 
into  mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset
 2005-10-12 21:58:02 +02:00
dlenev@mysql.com
cfc5adaf13 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-repl
 2005-10-12 23:45:14 +04:00
dlenev@mysql.com
3ee7382703 Temporary solution for bug #13969 "Routines which are replicated from master 
can't be executed on slave". It will be possible to solve this problem
in more correct way when we will implement WL#2897 "Complete definer support
in the stored routines".
 2005-10-12 23:42:51 +04:00
guilhem@mysql.com
03ed3231af slave.cc: 
SCCS merged
 2005-10-12 21:25:04 +02:00
pem@mysql.com
6a88684eb3 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/bug7049/mysql-5.0
 2005-10-12 16:39:39 +02:00
pem@mysql.com
304d4f580b Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13510/mysql-5.0
 2005-10-12 14:45:34 +02:00
sergefp@mysql.com
6266243deb Fix compile error on Windows: remove wrong typecast 2005-10-12 16:43:55 +04:00
pem@mysql.com
171f83944f Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13510/mysql-5.0
 2005-10-12 13:37: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
pem@mysql.com
b9b8349b3a Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13616/mysql-5.0
 2005-10-12 11:52:37 +02:00
pem@mysql.com
f3af927fff Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/usr/home/pem/bug13616/mysql-5.0
 2005-10-12 10:26:35 +02:00
gluh@eagle.intranet.mysql.r18.ru
4b2a0f0c70 after merge fix 2005-10-12 13:18:46 +05: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
gluh@mysql.com
d19c85199f 4.1->5.0 merge 2005-10-12 11:54:12 +05:00
evgen@moonbone.local
c16410d3a1 Manual merge, fix for bug #7672 2005-10-12 03:32:14 +04: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
lars@mysql.com
7a94010da9 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-hexdump
 2005-10-11 21:46:40 +02: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
hf@deer.(none)
40bd22ef69 Fix for bug #13667 (Inconsistency for decimal(m,d) specification. 2005-10-11 21:18:04 +05: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
c8a6c2c614 Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how 
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731)
 2005-10-11 09:12:12 -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
pem@mysql.com
9d16659d10 Merge mysql.com:/usr/local/bk/mysql-5.0 
into  mysql.com:/home/pem/work/bug7049/mysql-5.0
 2005-10-11 15:57:27 +02:00
pem@mysql.com
2456c0c668 Fixed BUG#13510: Setting password local variable changes current password 
Disallow conflicting use of variables named "password" and "names". If such
  a variable is declared, and "SET ... = ..." is used for them, an error is
  returned; the user must resolve the conflict by either using `var` (indicating
  that the local variable is set) or by renaming the variable.
  This is necessary since setting "password" and "names" are treated as special
  cases by the parser.
 2005-10-11 15:01:38 +02:00
guilhem@mysql.com
554970c058 To help people avoid BUG#2122 "changing hostname confuses master or slave" until it's fixed, 
we now issue a warning (at slave's server startup only) when a relay log is named
using the implicit hostname-relay-bin naming. Like we already do for binlogs.
 2005-10-11 15:01:24 +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
hf@deer.(none)
be0917049b Merging 2005-10-11 14:58:25 +05:00
jimw@mysql.com
083c032ec3 Fix minimum value of query_prealloc_size to be the same as its default. (Bug #13334) 2005-10-10 19:39:16 -07: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