mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-03-08 04:03:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
20040 commits 2857 branches 349 tags 1.6 GiB
Commit graph

4581 commits

Author SHA1 Message Date
serg@serg.mylan
24dcb103f3 fix rpl_trunc_binlog to test the new behaviour 2005-02-19 22:24:13 +01:00
pem@mysql.com
32a3c16385 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-02-18 17:46:30 +01:00
pem@mysql.comhem.se
a69fc3c03f Fixed... 
BUG#6642: Stored procedure crash if expression with set function
  BUG#7013: Stored procedure crash if group by ... with rollup
  BUG#7743: 'Lost connection to MySQL server during query' on Stored Procedure
  BUG#7992: SELECT .. INTO variable .. within Stored Procedure crashes
            the server
  BUG#8116: calling simple stored procedure twice in a row results
            in server crash

Rolling back the item change list after each substatement in a procedure
fixed the failing assert().
 2005-02-18 17:39:32 +01:00
serg@serg.mylan
b68514ddd1 after-merge fix 2005-02-18 14:53:23 +01:00
serg@serg.mylan
e1beaeac17 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
 2005-02-18 13:57:54 +01:00
serg@serg.mylan
1235e6d2c7 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
 2005-02-18 13:38:10 +01:00
msvensson@neptunus.(none)
3369b65931 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-02-18 13:31:28 +01:00
msvensson@neptunus.(none)
f454fc8a6c BUG#8585 ndb_cache fails on aix52 2005-02-18 13:29:27 +01:00
bar@mysql.com
6ef93274b0 Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0.fresh
 2005-02-18 16:14:28 +04:00
bar@mysql.com
47b85939a5 Bug with utf_general_ci, equals (=) has problem with accent insensitivity 
Backporting Monty's fix for 5.0 into 4.1.
 2005-02-18 16:10:12 +04:00
serg@serg.mylan
c0dda01f76 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
 2005-02-18 12:02:46 +01:00
msvensson@neptunus.(none)
3d0883bb05 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583
 2005-02-18 11:02:21 +01:00
jimw@mysql.com
7eb8c130f7 Merge 2005-02-17 16:16:58 -08:00
jimw@mysql.com
3c700572b4 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 15:23:28 -08:00
jimw@mysql.com
e3ff1bf326 Merge mysql.com:/home/jimw/my/mysql-4.1-8303 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:54:05 -08:00
jimw@mysql.com
219e29d7ae Merge mysql.com:/home/jimw/my/mysql-4.1-8471 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:53:07 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
4b4a5659df Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3
 2005-02-17 21:53:05 +00:00
jimw@mysql.com
08624c0061 Merge mysql.com:/home/jimw/my/mysql-4.1-8355 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:48:34 -08:00
jimw@mysql.com
9df11a3c5e Merge mysql.com:/home/jimw/my/mysql-4.1-7989 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-02-17 13:47:14 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
35f772c2bd Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.3
 2005-02-17 17:53:05 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
10ab9e982f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8147.1
 2005-02-17 17:52:49 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
647eaaea1d Bug#8147 
Merge from 4.1
 2005-02-17 17:38:13 +00:00
heikki@hundin.mysql.fi
173e200c65 innodb.test, innodb.result: 
Remove the test show status like InnoDB_rows_read; the value on IA64 was 0.01 percent bigger than on x86; maybe some different optimization
 2005-02-17 19:20:13 +02:00
msvensson@neptunus.(none)
55824f59b7 Merged test case 2005-02-17 14:45:52 +01:00
msvensson@neptunus.homeip.net
a004533a76 BUG#8547: Wrong errormessage when dropping table that does not exist in NDB 
- Added tescases
 - Added handling of HA_ERR_NO_SUCH_TABLE in mysql_rm_table_part2 so that 
   error messages now are consistent
 2005-02-17 14:22:44 +01:00
serg@serg.mylan
530eecbd99 Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa
 2005-02-17 14:00:44 +01:00
serg@serg.mylan
2b41b8fa01 post-review fixes. Now ROLLBACK is done in Format_description_log_event 2005-02-17 13:52:16 +01:00
svoj@mysql.com
349112292f bug#6958 
Fixed that negative arguments to certain integer options wrap around.
 2005-02-17 15:04:04 +04:00
igor@rurik.mysql.com
326b3ec1e7 select.test: 
Manual post-merge
 2005-02-17 00:51:27 -08:00
igor@rurik.mysql.com
4fd1869c6b Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-02-16 21:20:39 -08:00
igor@rurik.mysql.com
eedde7ba3e select.result, select.test: 
Added a test case for bug .
sql_select.cc:
  Fixed bug .
  When a string field was substituted for an equal constant
  the collation of the constant was changed by mistake for 
  the binary collation.
 2005-02-16 21:17:20 -08:00
kent@mysql.com
706a0dbc37 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-02-17 03:35:55 +01:00
kent@mysql.com
c9f6fbff1d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-02-17 03:34:30 +01:00
kent@mysql.com
ba927fdb4c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
 2005-02-17 03:04:28 +01:00
kent@mysql.com
75ebab7861 Windows compatibility changes of the 'rpl_delete_all', 
'ps_1general' and 'fulltext_cache' test cases.
 2005-02-17 02:59:39 +01:00
dean@mysql.com
2baf0a158c Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dellis/bkl/bug-4.1
 2005-02-16 19:37:53 -06:00
acurtis@pcgem.rdg.cyberkinetica.com
a1bf1c926e Bug#8147 
Fix ambigious table error for INSERT..SELECT..UPDATE
 2005-02-17 01:33:59 +00:00
dean@mysql.com
2f7595ea84 Merge mysql.com:/home/dellis/bkl/bug-4.1 
into mysql.com:/home/dellis/bkl/bug-5.0
 2005-02-16 17:35:00 -06:00
guilhem@mysql.com
18ecaae189 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-xa
 2005-02-16 23:27:20 +01:00
guilhem@mysql.com
f314564451 Fixes after 4.1->5.0 merge. 2005-02-16 23:23:20 +01:00
pekka@mysql.com
338f75a49d ndb - fix new decimal type mysql vs. ndb 2005-02-16 21:19:42 +01:00
guilhem@mysql.com
0987d81ae6 Merge 2005-02-16 21:03:58 +01:00
serg@serg.mylan
5ddb6354a5 after merge fixes 2005-02-16 17:34:02 +01:00
pekka@mysql.com
c32fc95769 ndb - temp: comment out decimal tests t/ndb* 2005-02-16 17:10:17 +01:00
pem@mysql.com
25a9717a03 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2005-02-16 16:12:52 +01:00
pem@mysql.comhem.se
de2b28c1ad Fixed BUG#8540: Local variable overrides an alias. 2005-02-16 16:06:41 +01:00
pekka@mysql.com
c177f9fc4a Merge 2005-02-16 13:14:21 +01:00
pekka@mysql.com
0d03304294 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41-1.2154.30.2
 2005-02-16 12:48:38 +01:00
pekka@mysql.com
7c9a155c4a ndb - fix old decimal type mysql vs ndb 2005-02-16 12:45:59 +01:00
dean@mysql.com
e7f410a14a Merge 2005-02-16 04:04:34 -06:00