1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-03 05:41:09 +03:00
Commit Graph

8514 Commits

Author SHA1 Message Date
kent@mysql.com
d0922679e0 Merge 2005-10-13 14:35:53 +02:00
konstantin@mysql.com
5269826383 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-12736
2005-10-13 14:46:57 +04:00
kent@mysql.com
7743016908 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-13 12:38:38 +02:00
kent@mysql.com
2747a73857 Merge 2005-10-13 12:23:50 +02:00
kent@mysql.com
5b448a8d9f Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-10-13 12:09:39 +02:00
elliot@mysql.com
a93780b23d BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsistency)
Updated more DDL statements to cause implicit commit.
2005-10-13 05:12:17 -04:00
konstantin@mysql.com
f6899b0783 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/opt/local/work/mysql-5.0-12736
2005-10-13 12:17:20 +04:00
tomas@poseidon.ndb.mysql.com
93d8c03d16 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-10-13 10:17:19 +02:00
konstantin@mysql.com
b2ff38202d A fix and a test case for Bug#12736 "Server crash during a select".
The bug was in JOIN::join_free which was wrongly determining that
all joins have been already executed and therefore all used tables
can be closed.
2005-10-13 11:53:00 +04:00
patg@krsna.patg.net
a46dd41255 BUG# 13052
Clean application of patch - 
- Added --tz-utc to fix issue of dumping timestamp values between 
servers with different global time zone settings, particularly 
with regard to the day of DST changeover, which without this fix,
 would dump duplicate timestamp values.
2005-10-12 22:44:42 -07:00
guilhem@mysql.com
1a45a2bc6f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/mysql_src/mysql-5.0
2005-10-13 00:31:25 +02:00
guilhem@mysql.com
a6ceb59491 fixes after merge of 4.1. 2005-10-13 00:29:23 +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
eric@mysql.com
06043b519a replace port number with string identifier so that it may have different ports and still run
(problem found by kent)
2005-10-12 14:33:08 -07:00
guilhem@mysql.com
8d900e90f0 Merge mysql.com:/home/mysql_src/mysql-4.1
into  mysql.com:/home/mysql_src/mysql-5.0
2005-10-12 23:33:07 +02:00
dlenev@mysql.com
ad7705fac5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-repl
2005-10-13 01:04:52 +04:00
kent@mysql.com
94ea4f188a make_binary_distribution.sh:
Copy *.cnf files in mysql-test/std_data/
Makefile.am:
  Added std_data/*.cnf to copy ndb config
2005-10-12 22:49:33 +02:00
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
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
tomas@poseidon.ndb.mysql.com
e5b76bb229 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-10-12 15:31:00 +02:00
tomas@poseidon.ndb.mysql.com
a191d8cce1 postt review fixes 2005-10-12 15:19:51 +02:00
tomas@poseidon.ndb.mysql.com
fd0cd55652 Bug #13009 No gaps allowed in node id number sequence
+ some small bugfixes in ndb_config
+ extending ndb_config to print connections and take shm option
2005-10-12 14:17:39 +02: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
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
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
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
hf@deer.(none)
cb7d5f4488 Merging 2005-10-11 16:39:35 +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
af951aa662 After merge fixes 2005-10-10 19:38:58 +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
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
kent@mysql.com
82615d8b9d Makefile.am:
Copy "disabled.def"
2005-10-10 00:21:10 +02:00
kent@mysql.com
9bca1b9124 func_group.test:
Test requires innodb
2005-10-09 01:32:09 +02: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
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
ramil@mysql.com
fcc51afb6a Populate t1 in order to get more predictable explain results. 2005-10-07 20:14:34 +05:00