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

14981 commits

Author SHA1 Message Date
monty@mysql.com
a7df038d16 Add back free that I accidently removed in last patch 2006-02-25 13:58:00 +02:00
monty@mysql.com
eff69e73a3 Fixed typo 2006-02-25 13:49:43 +02:00
monty@mysql.com
6fd52639c0 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-25 13:26:05 +02:00
monty@mysql.com
dd1d40f8f8 Fixed new introduced bug in binlog.test with --ps-protocol 2006-02-25 13:24:18 +02:00
brian@zim.(none)
f40705eb9b Merge zim.(none):/home/brian/mysql/mysql-5.0 
into  zim.(none):/home/brian/mysql/dep-5.1
 2006-02-24 23:31:57 -08:00
sergefp@mysql.com
8bb9343688 Fix a typo in dbug printout 2006-02-25 00:41:37 +03:00
dlenev@mysql.com
0c15039e74 Fix for bug #13525 "Rename table does not keep info of triggers". 
Let us transfer triggers associated with table when we rename it (but only if
we are not changing database to which table belongs, in the latter case we will
emit error).
 2006-02-24 23:50:36 +03:00
mats@mysql.com
c33a64a0e3 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/bk/mysql-5.1-release-bug13418-lars
 2006-02-24 20:27:51 +01:00
monty@mysql.com
aa4128f811 Merge monty@192.168.0.9:/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-02-24 18:36:09 +02:00
monty@mysql.com
82b77cdd90 Fixes to embedded server to be able to run tests with it 
(Needed for "list of pushes" web page and autopush)
 2006-02-24 18:34:15 +02:00
reggie@linux.site
52fbc7a1cd BUG# 17430 Partitoins: crash on SELECT * FROM t1 WHERE f_int1 IS NULL 
BUG# 17432: Partitions: wrong result, SELECT ... WHERE <column> is null
 2006-02-24 10:10:41 -06:00
lars@mysql.com
b4953f12a2 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-release-bug13418
 2006-02-24 16:22:06 +01:00
lars@mysql.com
32a8a469a7 BUG#13418 (V2): Bit columns should replicate correctly when using RBR 2006-02-24 15:38:20 +01:00
andrey@lmy004.
b6f338e9e5 Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16411
 2006-02-24 14:14:51 +01:00
andrey@lmy004.
11e5e40ede fix for bug #16411 (microseconds are allowed) 
last fixes
 2006-02-24 14:08:34 +01:00
andrey@lmy004.
734bfe4759 fix for bug #16411 (Microseconds are allowed for events) 2006-02-24 14:02:26 +01:00
evgen@moonbone.local
bcff10f1fb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/17530-bug-5.0-mysql
 2006-02-24 14:29:41 +03:00
andrey@lmy004.
c4602da973 merge 2006-02-24 12:03:32 +01:00
andrey@lmy004.
a594cd080c Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into lmy004.:/work/mysql-5.1-bug16412
 2006-02-24 11:56:16 +01:00
andrey@lmy004.
c04b3f4a91 Fix output per bug #16412 (Events: SHOW PRIVILEGES gives incorrect information) 
WL#1034 (Internal CRON)
 2006-02-24 11:52:03 +01:00
elliot@mysql.com
7e3f3f74cd Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-5.1-release
 2006-02-23 23:21:53 -05:00
elliot@mysql.com
5753dfe73d BUG#17521 alter database crashes slave 
Problem was a null pointer
Fixed by passing correct database name to slave filtering mechanism
Added test.
 2006-02-23 23:20:29 -05:00
andrey@lmy004.
68a0112047 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into lmy004.:/work/mysql-5.1-release
 2006-02-24 00:33:26 +01:00
andrey@lmy004.
5ac46bb961 fix for bug #16400 2006-02-24 00:29:50 +01:00
mats@mysql.com
adc9723611 Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/home/bk/fix-mysql-5.1-release
 2006-02-23 22:21:07 +01:00
mats@mysql.com
0cc0884200 Bug#17678 (RBR format change: moving from VLE to net encoding): 
Switching to use net_*_length() instead of VLE functions.
 2006-02-23 22:19:47 +01:00
konstantin@mysql.com
49ad134e9f After-merge fixes (Bug#13134) 2006-02-24 00:12:04 +03:00
konstantin@mysql.com
90edf3720a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-02-24 00:09:47 +03:00
konstantin@mysql.com
af62c4a959 Merge mysql.com:/opt/local/work/mysql-4.1-13134 
into  mysql.com:/opt/local/work/mysql-5.0-runtime
 2006-02-24 00:00:15 +03:00
paul@snake-hub.snake.net
85869e5fde Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-23 11:08:16 -06:00
paul@snake-hub.snake.net
f47ed62fb0 Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
 2006-02-23 11:07:56 -06:00
paul@snake-hub.snake.net
4ca8a492e2 Merge snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0 
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.1
 2006-02-23 09:41:04 -06:00
paul@snake-hub.snake.net
b2529c2ab2 mysqld.cc: 
Fix out of order entries in option struct.
 2006-02-23 09:11:05 -06:00
konstantin@mysql.com
630869bc56 Cleanup. 2006-02-23 16:21:43 +03:00
mats@mysql.com
584388c74c Merge mysqldev@production.mysql.com:my/mysql-5.1-release 
into  mysql.com:/users/mkindahl/bk/merge-b17181-mysql-5.1-new
 2006-02-23 13:49:27 +01:00
mats@mysql.com
5dab541c3a Bug#17181 (mysqlslap test server crash): 
Moving assignments to table_map_id for thread-safe handling of
  table shares.
 2006-02-23 13:34:03 +01:00
msvensson@neptunus.(none)
3ece1f3eda Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:54:56 +01:00
msvensson@neptunus.(none)
71ef9102c1 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-23 10:45:39 +01:00
msvensson@neptunus.(none)
8d78cd3e3c Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-02-23 10:41:37 +01:00
konstantin@mysql.com
0621428d79 Fix a bad merge of mine. 2006-02-23 12:32:54 +03:00
reggie@linux.site
3de74e6237 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  linux.site:/home/reggie/work/mysql-5.1
 2006-02-22 14:18:45 -06:00
reggie@linux.site
6cea16a825 BUG# 17393: Partitions: Wrong error message when assigning too many subpartitions 
We changed the error message to more clearly reflect the fact
that we are counting parts and subparts
 2006-02-22 14:17:11 -06:00
konstantin@mysql.com
5d07195888 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-22 20:15:24 +03:00
konstantin@mysql.com
97d36a453e Post-merge fixes. 2006-02-22 20:03:25 +03:00
aelkin@mysql.com
35861f3006 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug17265
 2006-02-22 18:53:34 +02:00
aelkin@mysql.com
4155d1405e BUG#17265 Assertion failure in rpl_row_view01. 
To quote Timour review lines:

The actual cause of the bug is that sql_base.cc:setup_wild()
sets "select_lex->with_wild = 0" (in the end of the function) once
it expands all wild-cards, and wild-card expansion is done during
the prepare phase. During this phase we replace all "*" with the
corresponding items, which for views happen to be references to
references. When we do execute, select_lex->with_wild = 0, and
all "*" are already replaced by the corresponding items, which
in the case of views need to be dereferenced first.

Fixed by refining the assert. Regression test for the bug is rpl_row_view01,
as was reported.
 2006-02-22 17:07:18 +02:00
mskold@mysql.com
bdf3e238b8 Removed unnecessary unlock/lock of mutex 2006-02-22 16:05:57 +01:00
mskold@mysql.com
865a3c9204 Fixes for push version of discover of on-line altered table 2006-02-22 15:19:22 +01:00
konstantin@mysql.com
a27e32b565 Merge mysql.com:/home/kostja/mysql/mysql-5.0-root 
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
 2006-02-22 14:04:24 +03:00
anozdrin@mysql.com
a77cc69e62 Fix for BUG#7787: Stored procedures: improper warning for "grant execute" statement. 
The problem was that error flag was not reset.
 2006-02-22 13:44:04 +03:00