database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
31,322 Commits 3,280 Branches 1,098 Tags
ff3a640e8f64b0fb25b51ea732b9f6c22f366bd2
Commit Graph

10662 Commits

Author SHA1 Message Date
sergefp@mysql.com
7e0455f333 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-07 23:50:59 +04:00
guilhem@mysql.com
3786538112 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-07 18:56:33 +02:00
guilhem@mysql.com
7108e4b017 updating test's result now that SHOW BINLOG EVENTS quotes and escapes user variables. 2004-06-07 18:55:53 +02:00
gluh@gluh.mysql.r18.ru
5725831c73 Fix for bug #4036 multiple SELECT DATE_FORMAT, incorrect results 2004-06-07 20:35:05 +04:00
gluh@gluh.mysql.r18.ru
147c2988cc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
 2004-06-07 19:58:34 +04:00
gluh@gluh.mysql.r18.ru
d381736c31 Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character 2004-06-07 17:39:17 +04:00
serg@serg.mylan
5d947f7b97 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-06-07 12:39:26 +02:00
serg@serg.mylan
86e9dc29b0 BUG#3987 - if(int, aggregate(int)) 2004-06-07 12:38:35 +02:00
pem@mysql.com
f87f27915e Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0-merge
 2004-06-07 12:09:17 +02:00
pem@mysql.comhem.se
12b65b31b8 Post-merge fixes. 2004-06-07 12:08:13 +02:00
brian@brian-akers-computer.local
f50066bdb9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-07 02:08:36 -07:00
sergefp@mysql.com
916579e3fd Merged 2004-06-07 12:21:26 +04:00
sergefp@mysql.com
1e05e6cb82 Post review fixes for "SQL Syntax for Prepared Statements". 2004-06-07 12:09:10 +04:00
bar@bar.intranet.mysql.r18.ru
b30b1ccc6a Bug #3928 regexp [[:>:]] and UTF-8 2004-06-07 12:51:18 +05:00
brian@brian-akers-computer.local
e24e1350a3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-05 10:43:22 -07:00
serg@serg.mylan
a0464b8563 one more ndb-isolating fix 2004-06-05 13:16:29 +02:00
sergefp@mysql.com
bec20d1fd7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-04 05:37:14 +04:00
guilhem@mysql.com
da835a0a06 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2004-06-03 23:19:01 +02:00
guilhem@mysql.com
86e8ecc965 Implementation of WL#1824 "Add replication of character set variables in 4.1", 
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill. 
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput  if query uses
 variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
 properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
 2004-06-03 23:17:18 +02:00
pem@mysql.comhem.se
3dcd7e53af Post-merge fixes. 
Not finished, will not be pushed until additional fixes have been made.
 2004-06-03 19:36:36 +02:00
sergefp@mysql.com
bd04f52552 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-03 20:54:46 +04:00
tomas@mc05.(none)
bf644e1785 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-06-03 13:15:55 +02:00
hf@deer.(none)
b8cf9f6afe Merging 2004-06-02 19:17:35 +05:00
hf@deer.(none)
7cf1d2596b wl 1562 (To improve RTree indexes) 
some changes to make code nicer
 2004-06-02 19:11:57 +05:00
tomas@mc05.(none)
783c4f0873 fixed naming error 2004-06-02 12:37:43 +02:00
tomas@poseidon.ndb.mysql.com
d58d6e2b1c collapsed ndb start/stop scripts in mysql-test-run + ndb bin name changes 2004-06-02 10:37:42 +00:00
tomas@poseidon.bredbandsbolaget.se
d369c2f241 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.bredbandsbolaget.se:/home/tomas/mysql-4.1-ndb
 2004-06-02 00:56:59 +00:00
tomas@poseidon.bredbandsbolaget.se
8d7d4c077b several ndb make changes, see respective file 2004-06-02 00:54:58 +00:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
tomas@mc05.(none)
4971ce3ec2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-06-01 22:39:40 +02:00
monty@mysql.com
53d05f4adb Removed compiler warnings 2004-06-01 23:39:39 +03:00
monty@mysql.com
197fcf1ee4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-01 22:30:03 +03:00
monty@mysql.com
017096695a Update version number 
Fixed serbian error messages
Fix for windows regarding changed variable name
 2004-06-01 22:29:46 +03:00
paul@ice.snake.net
7650da7711 README: 
Update README URL. (Bug #3678)
 2004-06-01 14:18:34 -05:00
hf@deer.(none)
39f69a2126 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.ftr
 2004-06-01 22:37:39 +05:00
tomas@mc05.(none)
308f40bb98 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-06-01 18:05:43 +02:00
sergefp@mysql.com
dc38512390 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-01 17:29:13 +04:00
sergefp@mysql.com
5843eec521 Manual merge 2004-05-29 20:55:46 +04:00
sergefp@mysql.com
742b759df7 * Undo of range optimizer fix from previous changeset 
* Fixed test results.
 2004-05-29 17:50:05 +04:00
sergefp@mysql.com
dff98a8ef7 * New index_merge EXPLAIN output format 
* Fixed a problem with wrong query results for partially covering keys in ROR-index_merge
 * ROR-intersection retrieval plan choice algorithm now uses less disk IO
   - and properly processes clustered PK range scans 
 * Fixed several minor range optimizer problems
 * Added more comments
 * Code cleanup
 2004-05-29 02:04:01 +04:00
bell@sanja.is.com.ua
9f51e30054 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-05-28 21:34:09 +03:00
bell@sanja.is.com.ua
266dd53da2 if exists should not be used inside test 
removed influence of some tests on other tests
 2004-05-28 21:31:51 +03:00
pem@mysql.comhem.se
27abb69250 Fixed BUG#2460: Crash wih Stored Procedure and UNION. 2004-05-28 19:43:06 +02:00
pem@mysql.comhem.se
a4729a9052 Added test cases for the following bugs that have been fixed by recent changes: 
BUG#1863: CREATE TABLE in Stored Procedure sometimes crashes on repeated calls.
 BUG#2656: select with join in stored procedure: erroneous result on 2nd call.
 BUG#3426: IF x IS NULL in stored procedure fails on second call within connection.
 BUG#3448: Stored Procedures with inner joins possible bug.
 BUG#3734: Stored procedure returns wrong rows with fulltext parameter.
 BUG#3863: Stored procedure crash when incrementing variable in a loop.

(And corrected the row count output to the client after CALL)
 2004-05-28 18:33:14 +02:00
ram@gw.mysql.r18.ru
8297e4b4a0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3738
 2004-05-28 16:38:06 +05:00
ram@gw.mysql.r18.ru
605962a938 a fix. 
(Bug#3738: SQL_CALC_FOUND_ROWS ignores WHERE if LIMIT used,
 Bug#3845: wrong FOUND_ROWS result)
 2004-05-28 15:01:16 +05:00
tomas@mc05.(none)
d1467d7a42 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
 2004-05-28 03:24:29 +02:00
monty@mysql.com
ccc4171276 Portability fix (using 'char' as argument to C functions may give warnings) 2004-05-28 02:36:43 +03:00
monty@mysql.com
be7f1a3570 merge with 4.0 to get fix for hpux 2004-05-28 02:04:07 +03:00
monty@mysql.com
a7c17eee46 Portability fix for 32 bit file systems 2004-05-28 00:32:55 +03:00