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
12745 commits 2793 branches 343 tags 1.7 GiB
Commit graph

6628 commits

Author SHA1 Message Date
ingo@mysql.com
4de7e18b81 Hand-resolved auto merge 2004-04-07 14:56:24 +02:00
bell@sanja.is.com.ua
61fd95d168 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
 2004-04-07 15:23:05 +03:00
vva@eagle.mysql.r18.ru
5fa9953ce3 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_3342/mysql-4.1
 2004-04-07 17:23:04 +05:00
ingo@mysql.com
ce816b351c Worklog#1563 - Support of on-line CREATE/DROP INDEX. 
Corrected minor problems of the preceding changeset 1.1705.
 2004-04-07 13:12:05 +02:00
bell@sanja.is.com.ua
560a9f66d3 after review changes 2004-04-07 13:25:24 +03:00
monty@mysql.com
70c4eb5838 Portability fixes 
Fixed problems with group_concat() and HAVING
Updated crash-me values
 2004-04-07 04:33:58 +03:00
guilhem@mysql.com
44a6fcba2f Fix for BUG#3401 "Rare replication bug which leads to "Binlog has bad magic number" from slave": 
Backport of a part of this changeset of 4.1:
ChangeSet@1.1753.1.1, 2004-04-05 13:56:05+03:00, monty@mysql.com
which fixes the bug.
 2004-04-07 01:14:11 +02:00
guilhem@mysql.com
da6685fba5 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-04-07 00:58:53 +02:00
guilhem@mysql.com
b5ffdec204 This is a fix for a bug in 3.23 -> 4.0 replication: Exec_master_log_pos is always 
too big by 6 bytes. So I add code to substract 6 bytes if the master is 3.23.
This is not perfect (because it won't work if the slave I/O thread has not
noticed yet that the master is 3.23), but as long as the slave I/O thread
starts Exec_master_log_pos will be ok.
It must be merged to 4.1 but not to 5.0 (or it can be, because of #if MYSQL_VERSION_ID),
because 5.0 already works if the master is 3.23 (and in a more natural way:
in 5.0 we store the end_log_pos in the binlog and relay log).
I had to move functions from slave.h to slave.cc to satisfy gcc.
 2004-04-07 00:57:14 +02:00
serg@serg.mylan
e8eda8129f ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert() 
Field::val_str simplification, comment
 2004-04-06 21:35:26 +02:00
monty@mysql.com
472e87a40c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-06 18:30:34 +03:00
vva@eagle.mysql.r18.ru
aeff7ce714 fixed 
bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
(now it require only SELECT privilege on database)
 2004-04-06 20:26:35 +05:00
bar@bar.intranet.mysql.r18.ru
950a2ebab1 Fixed charsetnr sent to the client 2004-04-06 19:57:33 +05:00
pem@mysql.comhem.se
1541f2e794 Fixed BUG#2780: Stored procedure exit handler ignored for warnings. 
Actually catch pushed warnings.
 2004-04-06 16:29:38 +02:00
monty@mysql.com
7ca9a70583 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-06 17:17:15 +03:00
serg@serg.mylan
83f6f4a05c Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-04-06 16:17:14 +02:00
vva@eagle.mysql.r18.ru
0cc998a466 fixed the tests mysql-test/t/synchronization.test 
for Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
 2004-04-06 19:17:13 +05:00
pem@mysql.comhem.se
4a6e6251e7 Fixed BUG#2776: Stored procedure crash if variable assigned to default. 
Keep track on the default value and use it. (Or NULL, if not declared.)
 2004-04-06 15:48:58 +02:00
marko@hundin.mysql.fi
6af38c65be InnoDB: send diagnostic output to stderr or files 
instead of stdout or fixed-size memory buffers
 2004-04-06 16:14:43 +03:00
pem@mysql.comhem.se
eb7319e850 Fixed BUG#2772: Function with character set clause fails in stored procedures. 
Complex return types were not stored correctly in the mysql.proc table.
 2004-04-06 13:26:53 +02:00
serg@serg.mylan
518b601f88 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-04-06 13:22:10 +02:00
serg@serg.mylan
c1d8752081 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-04-06 12:32:02 +02:00
serg@serg.mylan
d6975b6367 don't modify constant strings 2004-04-06 12:31:25 +02:00
gluh@gluh.mysql.r18.ru
2ae2b946d6 Previous patch was wrong :( 
Here is 2nd version.
'reduce/reduce conflicts' issue is fixed
 2004-04-06 15:00:51 +05:00
monty@mysql.com
49330f61da Fixed warnings from valgrind (not a bug) 
Don't add -debug to server version if MYSQL_SERVER_PREFIX is used
Indentation cleanups
 2004-04-06 12:13:43 +03:00
brian@brian-akers-computer.local
abb40bace9 ha_example.h: 
Fixed spelling of example share and fxed indention.
ha_example.cc:
  Fixed spelling of example and removed a few unneeded printf pieces.
my_base.h:
  Adde HA_ERR_NOT_IMPLEMENTED at Monty's request
 2004-04-05 22:57:53 -07:00
brian@brian-akers-computer.local
e1527cd7ec Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1-examples
 2004-04-05 22:35:23 -07:00
bell@sanja.is.com.ua
75e7ca479e reverting table list to be able to use it in next PS call (BUG#2811) 2004-04-06 00:10:43 +03:00
pem@mysql.comhem.se
95dcdde134 Fixed BUG#3287: Stored procedure handler scope outside of begin/end. 
Backpatching overwrote already backpatched instructions, which made it
skip the hpop instruction; possibly not only a problem for handlers,
but this is one known case when it happened.
 2004-04-05 17:01:19 +02:00
gluh@gluh.mysql.r18.ru
03caa47acb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.curr
 2004-04-05 19:14:31 +05:00
monty@mysql.com
0013516951 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-05 16:28:16 +03:00
gluh@gluh.mysql.r18.ru
8a4e6c6482 WL1368: SHOW GRANTS FOR CURRENT USER 
'SHOW GRANTS' syntax is added 
  'SHOW GRANTS FOR CURRENT_USER' syntax is added
  'SHOW GRANTS FOR CURRENT_USER()' syntax is added
 CURRENT_USER without parens in expressions(SELECT CURRENT_USER;)
 2004-04-05 17:55:26 +05:00
marko@hundin.mysql.fi
f7f8efc263 InnoDB: Backport fil_path_to_mysql_datadir from MySQL 4.1.x 2004-04-05 15:40:56 +03:00
monty@mysql.com
42cf92ce37 Fixed many compiler warnings 
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319)
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly
 2004-04-05 13:56:05 +03:00
bell@sanja.is.com.ua
3b0bf66ec1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps2-4.1
 2004-04-05 11:16:44 +03:00
bell@sanja.is.com.ua
1e4af935c1 removed old way to prevent using stack tables for caching Items in PS 
fixed error code in union test
 2004-04-04 03:05:44 +03:00
miguel@hegel.local
a149089abb Spanish and Portuguese translation. 2004-04-03 19:33:55 -03:00
wax@kishkin.ru
f3e348bcca BUG#3328 
I can't see group_concat_max_len in a list of variables
 2004-04-04 03:05:31 +06:00
bell@sanja.is.com.ua
b30c28d85d for Item_param we have to have value set instead of fave item fixed (BUG#3353) 
fixed outer joins
test of different joins included
 2004-04-03 17:23:41 +03:00
bell@sanja.is.com.ua
c31f3cf1d2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-on-4.1
 2004-04-03 11:28:20 +03:00
bell@sanja.is.com.ua
2f4d2a0e38 fixed brocken of client_test 
fixed aggregate functions in PS (BUG#3360)
 2004-04-03 11:13:51 +03:00
serg@serg.mylan
3cd665ba3c Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-04-02 23:50:41 +02:00
vva@eagle.mysql.r18.ru
00d429ac51 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
 2004-04-03 02:47:02 +05:00
vva@eagle.mysql.r18.ru
5f2d73ed96 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
 2004-04-03 02:46:12 +05:00
vva@eagle.mysql.r18.ru
8cc3b3cfdc made some optimization of last patch for 
Bug #2385 "CREATE TABLE LIKE lacks locking on source and destination table" 
(in sql_table.cc and mysql-test/t/synchronization.test)
 2004-04-03 02:44:38 +05:00
vva@eagle.mysql.r18.ru
1198b23a73 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2397/mysql-4.1
 2004-04-03 01:39:45 +05:00
serg@serg.mylan
fced5fa188 cleanup of ha_myisam::deactivate_non_unique_index() and Co. 2004-04-02 20:42:35 +02:00
miguel@hegel.local
d17e85b764 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hegel.local:/home/miguel/bk/mysql-4.1
 2004-04-02 11:10:29 -03:00
marko@hundin.mysql.fi
23a5fc5558 InnoDB: ignore intra-database foreign key references between tables 
when dropping database (Bug #3058)
 2004-04-02 16:25:48 +03:00
pem@mysql.comhem.se
fce57a1190 Added missing error message and corrected another one. 2004-04-02 10:27:01 +02:00