mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 11:01:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
23416 commits 2788 branches 343 tags 1.7 GiB
Commit graph

23416 commits

This branch
This branch
All branches
Author SHA1 Message Date
monty@mysql.com
775f17667b Merge with 4.1 2005-06-07 00:31:53 +03:00
monty@mysql.com
8c94b5fba7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 20:42:55 +03:00
monty@mysql.com
dec2607e1d Ensure that we reset auto-increment cache if we have to do an UPDATE becasue of REPLACE 
This fixes bug #11080: Multi-row REPLACE fails on a duplicate key error
 2005-06-06 20:41:52 +03:00
reggie@monster.
d83c495b9e Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 
into monster.:D:/Work/mysql5.0
 2005-06-06 11:45:42 -05:00
monty@mysql.com
b46f2ecf2f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 19:43:07 +03:00
reggie@monster.
4283fdb170 fixes for compiler warnings from VC6 2005-06-06 11:34:52 -05:00
bar@mysql.com
abb2d7aa34 ctype_cp1250_ch.result, ctype_cp1250_ch.test: 
Adding test.
ctype-win1250ch.c:
  Bug #9759 Empty result with 'LIKE' and cp1250_czech_cs
  Wrong min_sort_char fix.
 2005-06-06 21:22:23 +05:00
lenz@mysql.com
80fbb13e97 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-06-06 18:03:16 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
db23a7ec29 A logger patch for Netware. 2005-06-06 19:00:50 +03:00
monty@mysql.com
22d20f89e5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 18:48:01 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
03526f1c2c A fix for Metrowerks compiler. 2005-06-06 18:34:44 +03:00
monty@mysql.com
8c1c166487 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 18:31:38 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
ea7f982ef0 Some fixes for Netware. 2005-06-06 18:30:59 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
fb5333120f Some fixes for Netware builds. 2005-06-06 17:59:00 +03:00
monty@mysql.com
e43cbebc59 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 16:54:56 +03:00
lenz@mysql.com
13afa9129b Some Windows compile improvements: 
- removed some unreferenced variables
 - fixed the libmysql project file by removing a duplicate file reference (merge error)
 2005-06-06 15:23:04 +02:00
igor@rurik.mysql.com
6ee824705e Merge rurik.mysql.com:/home/igor/mysql-5.0 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2005-06-06 06:15:09 -07:00
igor@rurik.mysql.com
f2405d71eb sp.test, sp.result: 
Added a test case for bug #6866.
sql_select.cc:
  Fixed bug #6866.
  Bug was due to the fact that on_expr was not backed up
  for the second execution of the stored procedure.
 2005-06-06 06:05:11 -07:00
bar@mysql.com
9bbad19dd4 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/bar/mysql-5.0.turk
 2005-06-06 16:55:06 +05:00
bar@mysql.com
2df945d87b Bug#8610: The ucs2_turkish_ci collation fails with upper('i') 
UPPER/LOWER now can return a string with different length.

mi_test1.c:
  Adding new arguments.
Many files:
  Changeing caseup/casedn to return a result with different
  length than argument.
sql_string.h:
  Removing unused method,
mysql_priv.h:
  Removing unused method
 2005-06-06 16:54:15 +05:00
konstantin@mysql.com
95da927081 Portability fix, mySTL on Sun Forte 5.4. 2005-06-06 15:52:45 +04:00
monty@mysql.com
db4dc60d5c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-06-06 14:36:21 +03:00
monty@mysql.com
e18bb16ee5 Fixed wrong key length when using MIN() optimization (non fatal, but caused InnoDB to write warnings to the log file) 
This fixed bug #11039: InnoDB: Warning: using a partial-field key prefix in search
 2005-06-06 14:03:33 +03:00
konstantin@mysql.com
b6e895ad9f Futher fixes for aCC. 2005-06-06 14:52:43 +04:00
konstantin@mysql.com
dcae1d174f Futher yaSSL portability fixes: hp3750 (HP aCC + HPUX). 2005-06-06 14:43:21 +04:00
konstantin@mysql.com
b24269103c Fix yaSSL compilation failure on ds20 (DEC CXX + Linux) 2005-06-06 14:28:00 +04:00
ramil@mysql.com
c956ed5494 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b10539
 2005-06-06 13:14:20 +05:00
lenz@mysql.com
ae97cc1c92 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/space/my/mysql-5.0
 2005-06-06 08:46:15 +02:00
ramil@mysql.com
592d8f8d41 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/ram/work/5.0.b10539
 2005-06-06 11:30:15 +05:00
ramil@mysql.com
417447ae82 Merge 2005-06-06 10:39:21 +05:00
konstantin@mysql.com
c2f7e4d610 Fix broken linking when building with ha_federated 2005-06-05 23:00:45 +04:00
kent@mysql.com
5ec1549776 mtr_misc.pl, mtr_report.pl: 
Try kill all children to the mysql-test-run process when exiting
mtr_process.pl:
  Added new function mtr_exit() that try kill all children to the mysql-test-run process when exiting
mysql-test-run.pl:
  Try kill all children to the mysql-test-run process when exiting
  New --vardir caused problems on Windows
  Changed faulty calls to error() to mtr_error()
 2005-06-05 20:10:47 +02:00
serg@serg.mylan
6a5349028c a compiler must see '#pragma implementation' *before* 
'#pragma interface' (that comes with the #include'd header file)
 2005-06-05 19:38:52 +02:00
kent@mysql.com
b7696f414c sp_rcontext.cc, sp_pcontext.cc, sp_head.cc, sp_cache.cc, ha_federated.cc: 
Include "mysql_priv.h" before testing USE_PRAGMA_IMPLEMENTATION
 2005-06-05 16:20:22 +02:00
monty@mysql.com
4b7882dc73 merge 2005-06-05 17:19:50 +03:00
monty@mysql.com
25a2c4a71e Cleanup during review 
Simple optimization for 2 argument usage to function of variable arguments
Fix stack overrun when using 1+1+1+1+1+1+1+....
Update crash-me results for 5.0
Don't call post_open if pre_open() fails (optimization)
 2005-06-05 17:01:20 +03:00
konstantin@mysql.com
f0233c2e3d Fix show warnings limit 0 and show warnings limit 0, 0. 
Add test coverage for SHOW WARNINGS LIMIT a, b;
 2005-06-04 14:58:32 +04:00
serg@serg.mylan
10f8d83dcb Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-04 11:15:36 +02:00
konstantin@mysql.com
ada8f09186 Add missing STMT_ATTR_PREFETCH_ROWS to mysql_stmt_attr_get 2005-06-04 12:37:10 +04:00
serg@serg.mylan
74f2ffc6d2 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-04 10:23:44 +02:00
serg@serg.mylan
7a1282b3e5 mergemerged 2005-06-04 07:28:26 +02:00
serg@serg.mylan
dc0df7ee5a after mergemerge 2005-06-04 07:15:11 +02:00
jimw@mysql.com
0f8c2e2a4b Merge mysql.com:/home/jimw/my/mysql-5.0-10590 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-06-03 16:06:51 -07:00
monty@mysql.com
a49387a1e8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-06-03 23:46:44 +03:00
monty@mysql.com
29fd1f2fd9 Move USE_PRAGMA_IMPLEMENTATION to proper place 
Ensure that 'null_value' is not accessed before val() is called in FIELD() functions
Fixed initialization of key maps. This fixes some problems with keys when you have more than 64 keys
Fixed that ROLLUP don't always create a temporary table. This fix ensures that func_gconcat.test results are now predictable
 2005-06-03 23:46:03 +03:00
serg@serg.mylan
d26c13b439 client/mysql.cc 
make print_field_types() somewhat more useful
 2005-06-03 21:59:33 +02:00
serg@serg.mylan
aaa4c11d11 mergemerged 2005-06-03 21:24:13 +02:00
serg@serg.mylan
5b810bc607 after merge fixes 2005-06-03 21:08:45 +02:00
hartmut@mysql.com
4208f74948 Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
 2005-06-03 20:08:38 +02:00
hartmut@mysql.com
1e5f1078c6 Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1 
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
 2005-06-03 19:15:16 +02:00