mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
12127 commits 2780 branches 343 tags 1.6 GiB
Commit graph

3247 commits

Author SHA1 Message Date
monty@mysql.com
f9ad650490 merge with 4.0 2004-03-17 10:36:12 +02:00
monty@mysql.com
350b433569 merge with 4.0 2004-03-16 22:41:30 +02:00
bell@sanja.is.com.ua
8a1675c869 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
 2004-03-16 20:55:51 +02:00
bell@sanja.is.com.ua
293bb8fee7 merge 2004-03-16 20:23:07 +02:00
bell@sanja.is.com.ua
579a94a328 after review & some other fixes 2004-03-16 20:19:36 +02:00
serg@serg.mylan
eb6f68ec9a uuid() tests 2004-03-16 16:35:53 +01:00
serg@serg.mylan
49e9b153ff Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-03-16 16:35:52 +01:00
bell@sanja.is.com.ua
b8c065c527 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
 2004-03-16 17:35:50 +02:00
bell@sanja.is.com.ua
c9938b9dff merge 2004-03-16 17:35:49 +02:00
serg@serg.mylan
ceec63f18a EOVERFLOW moved to my_base.h - it is used not only in strtod.c 
error message corrected
 2004-03-16 16:35:47 +01:00
bell@sanja.is.com.ua
28b8501326 after merge fix 2004-03-16 16:30:10 +02:00
bell@sanja.is.com.ua
cd5c30c5dc fix test during merge 2004-03-16 16:30:09 +02:00
bell@sanja.is.com.ua
96a9d0da52 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
 2004-03-16 16:30:08 +02:00
bell@sanja.is.com.ua
b206f29e6c Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2004-03-16 15:14:12 +02:00
gluh@gluh.mysql.r18.ru
df842c2fc3 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.clear
 2004-03-16 17:14:11 +04:00
bell@sanja.is.com.ua
7106dcfd06 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
 2004-03-16 15:14:11 +02:00
ram@gw.mysql.r18.ru
bfc1e46c10 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2885
 2004-03-16 17:14:10 +04:00
bell@sanja.is.com.ua
73e5e0672c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
 2004-03-16 15:14:10 +02:00
vva@eagle.mysql.r18.ru
8d5430ef73 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2709/mysql-4.1
 2004-03-16 17:14:09 +04:00
ram@gw.mysql.r18.ru
f54827e5d0 Fix for the bug #3118: Subquery and order by 2004-03-16 16:28:50 +04:00
hf@deer.(none)
cdc27d597e Fix for #233 (final part) 2004-03-16 14:59:22 +04:00
gluh@gluh.mysql.r18.ru
8ba33d7dd3 Fix for bug#2586 Disallow global/session/local as structured var. instance names 2004-03-16 14:01:05 +04:00
ram@gw.mysql.r18.ru
75ced0832e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2885
 2004-03-16 12:59:06 +04:00
gluh@gluh.mysql.r18.ru
f6816f32bd Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.0.3067
 2004-03-16 11:33:36 +04:00
gluh@gluh.mysql.r18.ru
86211a1b44 Fix for bug #2629 NULLIF() doesn't behave as described in manual 2004-03-16 11:33:03 +04:00
bell@sanja.is.com.ua
e8a9242893 merge 2004-03-16 08:32:21 +02:00
bell@sanja.is.com.ua
7ff1a94358 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-lower_case-4.1
 2004-03-16 08:18:36 +02:00
bell@sanja.is.com.ua
ac8c1cc4be Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-fix_fields-4.1
 2004-03-16 07:40:11 +02:00
monty@mysql.com
325f661525 Remove not needed patch 2004-03-16 02:59:39 +02:00
monty@mysql.com
37390968e7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-03-16 00:04:05 +02:00
sergefp@mysql.com
3d2794ae9a Fix for Bug#3183 2004-03-15 23:11:58 +03:00
vva@eagle.mysql.r18.ru
189761bcd3 actions for bug 
#2709 Affected Rows for ON DUPL. KEY undocumented, perheps illogical 
1. added COPY_INFO::updated to work with it in
   'insert .. on duplicate' instead of COPY_INFO::deleted
2. added affected rows to output of "info:" in mysqltest.c
 2004-03-15 21:36:16 +04:00
Sinisa@sinisa.nasamreza.org
8c4b59b72c update.test: 
a fix for a test with latest change
 2004-03-15 19:17:18 +02:00
bell@sanja.is.com.ua
c5d4801678 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-rand-4.1
 2004-03-15 17:41:03 +02:00
gluh@gluh.mysql.r18.ru
9f22beb242 Fix for bug#2972 Problem the the CONV() function 2004-03-15 19:18:30 +04:00
bell@sanja.is.com.ua
6fc3d9ba81 merge 2004-03-15 17:01:30 +02:00
bell@sanja.is.com.ua
3e1c841ced Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-fix_fields-4.1
 2004-03-15 16:31:41 +02:00
gluh@gluh.mysql.r18.ru
df0ede69fc Task #835: additional changes fot str_to_date 2004-03-15 18:28:21 +04:00
monty@mysql.com
9e8938cbae merge & simple cleanup 2004-03-15 13:21:14 +02:00
bell@sanja.is.com.ua
d2265b6345 merge 2004-03-15 13:16:40 +02:00
monty@mysql.com
cf66e187e2 Optimizations 2004-03-15 12:53:27 +02:00
serg@serg.mylan
ded8fa56eb my_strtod fixes: 
sigsegv protection (exp overflow)
don't return inf!
use errno=EOVERFLOW to signal an overflow (as my_strntod uses errno anyway)
if errno will be too slow, my_strtod can be changed to return overflow status in a parameter (like my_strntod does)
 2004-03-14 17:25:20 +01:00
vva@eagle.mysql.r18.ru
283d455711 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_856/mysql-4.1
 2004-03-14 01:33:16 +04:00
vva@eagle.mysql.r18.ru
b3cb4dace5 fixed bug #856 'Naming a key "Primary" causes trouble' 2004-03-14 01:31:30 +04:00
Sinisa@sinisa.nasamreza.org
91386f63de after merge fixes. 2004-03-13 21:22:55 +02:00
vva@eagle.mysql.r18.ru
5bada5ee99 fixed bug #1427 "enum allows duplicate values in the list" 2004-03-13 23:13:31 +04:00
Sinisa@sinisa.nasamreza.org
639f411a82 multi_update.result: 
Fix for a bug in the result
multi_update.test:
  Fix for a bug in the test
 2004-03-13 21:06:36 +02:00
vva@eagle.mysql.r18.ru
158770e356 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2985/mysql-4.0
 2004-03-12 17:56:27 +04:00
monty@mysql.com
91a8546112 Portability fixes & fixing of test suite 2004-03-12 09:15:08 +02:00
monty@mysql.com
012ce71c7f Merge 2004-03-12 01:13:04 +02:00
monty@mysql.com
98fb8ea4c7 Merge with 3.23 to get patch for floor() 2004-03-12 01:12:14 +02:00
monty@mysql.com
e27960a44e Ensure that install_test_db.sh script works with both 'make install' and 'make_binary_distribution' layouts 
Abort if we can't allocate memory for table cache
Fix bug with multi-update-tables and BDB tables.
 2004-03-12 01:10:22 +02:00
Sinisa@sinisa.nasamreza.org
37817f60cc Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2004-03-11 22:27:17 +02:00
Sinisa@sinisa.nasamreza.org
a86753b00e multi_update.result: 
Test case for a #2996 bug fix
multi_update.test:
  test case for a #2996 bug fix
sql_select.cc:
  Fix for a bug #2996 involving multi-table updates over the const tables
 2004-03-11 22:26:03 +02:00
vva@eagle.mysql.r18.ru
0be2ef688c merge correcttion in mysql-test/r/mysqldump.result 2004-03-11 22:43:10 +04:00
vva@eagle.mysql.r18.ru
bb6aee84ef Merge 2004-03-11 22:01:25 +04:00
guilhem@mysql.com
69517b22a1 Fix for BUG#2983 "If statement was killed on master, slave errors despite replicate-wild-ignore-t" 
We introduce a new function mysql_test_parse_for_slave().
If the slave sees that the query got a really bad error on master
(killed e.g.), then it calls this function to know if this query
can be ignored because of replicate-*-table rules (do not worry
about replicate-*-db rules: they are checked so early that they have
no bug). If the answer is yes, it skips the query and continues. If
it's no, then it stops and say "fix your slave data manually" (like it
did before this change).
 2004-03-11 17:38:19 +01:00
pem@mysql.comhem.se
6c6bbba007 WL#1366: Use the schema (db) associated with an SP. 
Phase 2: Make SPs belong to a DB, and use qualified names.
  As a side effect, using USE in an SP is no longer allowed.
  (It just doesn't work otherwise.)
 2004-03-11 17:18:59 +01:00
vva@eagle.mysql.r18.ru
3c1ba83296 fixed bug #2591 "mysqldump quotas names inconsistently" 2004-03-11 18:46:27 +04:00
ram@gw.mysql.r18.ru
0aab3a9eba a fix (bug #2885: like datetime) 2004-03-11 18:21:57 +04:00
vva@eagle.mysql.r18.ru
8dc504a3c5 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
 2004-03-10 23:36:22 +04:00
vva@eagle.mysql.r18.ru
a135907547 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2874/mysql-4.0
 2004-03-10 23:35:40 +04:00
vva@eagle.mysql.r18.ru
faa9c92765 fixed BUG #2874 "Grant table bug" and 
added tests for testing structure of mysql db
 2004-03-10 22:54:07 +04:00
monty@mysql.com
4ee44751d9 Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882) 2004-03-10 13:46:11 +02:00
ram@gw.mysql.r18.ru
cd7ec53dad Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3036
 2004-03-10 13:36:20 +04:00
jani@ua72d24.elisa.omakaista.fi
8dcb41d8d9 Fixed Bug#3115. CAST AS DATE with malformed string returns NULL but IS NULL 
is false.
 2004-03-09 22:03:01 +02:00
ram@gw.mysql.r18.ru
8ffd9a9190 Fix for the bug #3089: SUBSTRING bug when mixed with CONCAT and ORDER BY 2004-03-09 16:52:37 +04:00
bell@sanja.is.com.ua
7e48a0f610 merge 2004-03-09 12:52:25 +02:00
paul@ice.snake.net
ea28e842cd Make SHOW VARIABLES output really alphabetic. 
Note: the patch removes an extra declaration of
the read_only variable. It also assumes that '_'
sorts before [a-z].
 2004-03-07 20:19:37 -06:00
paul@ice.local
09113817d2 SESSION instead of LOCAL in error messages. 2004-03-07 08:32:00 -06:00
vva@eagle.mysql.r18.ru
5ccb6a1cc7 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2593/mysql-4.1
 2004-03-06 18:27:11 +04:00
monty@mysql.com
73780de129 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-03-06 10:43:53 +02:00
monty@mysql.com
ef971bb604 Ensure that one can't from the command line set a variable too small. (Bug #2710) 
Allow one to force lower_case_table_names to 0, even if the file system is case insensitive. This fixes some issues on Mac OS X (Bug #2994)
Added variables "lower_case_file_system", "version_compile_os" and "license"
 2004-03-06 10:43:35 +02:00
vva@eagle.mysql.r18.ru
d52086295f Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
 2004-03-06 03:02:12 +04:00
vva@eagle.mysql.r18.ru
e8d78e5a4a Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2082/mysql-4.1
 2004-03-06 03:01:09 +04:00
vva@eagle.mysql.r18.ru
a8bbcc52a9 - added commands --query_vertical and --query_horisontal to client/mysqltest.cc 
- get my_strtod to return inf
- get Field_float::store(double) and Field_double::store(float) to set null for 
nan value 
(as extra serg's recomendations to fix for patch on 
 Bug #2082 'mysqldump converts "inf" to null')
 2004-03-06 03:00:21 +04:00
vva@eagle.mysql.r18.ru
29bc7b03a0 fixed Bug #2985 
"Table truncated when creating another table name with Spaces"
added to check_db_name, check_table_name and check_column_name
test for end space
 2004-03-05 22:13:33 +04:00
monty@mysql.com
9618683f3c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-03-05 19:50:12 +02:00
monty@mysql.com
8f093d0fb3 Portability fixes 2004-03-05 19:49:50 +02:00
vva@eagle.mysql.r18.ru
d2f0d0726b commented testcases in show_check.test with quotation marks in table name 
to avoid troubles with OS which don't support these symbols in file name
used create table 'a/b' as hook for WL#1324 which should fix this problem
 2004-03-05 17:57:36 +04:00
serg@serg.mylan
46c03de1a9 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-03-05 00:20:24 +01:00
serg@serg.mylan
de6d3b8dff UNHEX() function 2004-03-04 23:18:54 +01:00
vva@eagle.mysql.r18.ru
cba6ff7597 fixed Bug #3051 "FLOOR returns invalid" 2004-03-04 22:11:33 +04:00
vva@eagle.mysql.r18.ru
b097995293 Fixed bug #2082 'mysqldump converts "inf" to NULL' and 
added commands vertical_results and horisontal_results to client/mysqltest.c
 2004-03-04 21:08:14 +04:00
bell@sanja.is.com.ua
d03034d306 invalidation of locking for write tables (BUG#2693) 
fixed linking query_prealloc_size to query cache presence
 2004-03-04 18:32:55 +02:00
monty@mysql.com
b9c4ee353d Rollback UPDATE/DELETE statements on kill 
nsure that rows in a multi-row INSERT DELAYED are inserted atomicly
 2004-03-04 18:16:10 +02:00
hf@deer.(none)
18d722ff93 Merging 2004-03-04 17:52:06 +04:00
serg@serg.mylan
f8345cc617 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-03-04 14:48:28 +01:00
serg@serg.mylan
c4b55a2aea drop tables in windows-compatible order 2004-03-04 14:47:33 +01:00
monty@mashka.mysql.fi
93dd971bed Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2004-03-04 10:07:32 +02:00
monty@mashka.mysql.fi
afd8f38f4e Optimized GIS functions 2004-03-04 08:50:37 +02:00
bar@bar.intranet.mysql.r18.ru
c93ff40c51 Bug #2959 UTF8 charset breaks joins with mixed column/string constant 2004-03-03 11:22:25 +04:00
pem@mysql.com
91cc4b288e Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2004-03-02 16:01:02 +01:00
pem@mysql.comhem.se
1631ba625f Fixed BUG#2777: Stored procedure doesn't observe definer's rights. 
SQL SECURITY DEFINER must enforce reduced rights too, not just additional rights.
 2004-03-02 11:52:19 +01:00
Sinisa@sinisa.nasamreza.org
7f3771bc76 fix for a bug #2953. 
When password was granted with a global grant, then granting 
privileges on database level, without password being specified, 
will temporary (in memory) set password to ''.
 2004-03-01 21:54:08 +02:00
guilhem@mysql.com
e022ba6063 Fix for BUG#3017 
"wrong Relay_Log_Pos if Rotate is in the middle of a transaction in relay log"
increment 'pending' instead of 'relay_log_pos'.
 2004-03-01 00:46:31 +01:00
serg@serg.mylan
0ea1dd850d bug#3011 - multi-byte charset in fulltext 2004-02-29 22:58:45 +01:00
guilhem@mysql.com
5137821cea small after-merge fixes (error messages). 2004-02-28 23:36:41 +01:00
serg@serg.mylan
9200fe3ba6 make func_misc portable 
on different systems sprintf("%.3", 1.555499999999999) behaves differently
 2004-02-28 11:24:49 +01:00
serg@serg.mylan
111ffb7631 restored func_misc.result after my_strtod fix 2004-02-27 23:33:29 +01:00
lenz@kallisto.local
743bc4628a - fixed test result: FORMAT(12345.5555,3) really should return "12,345.556" 2004-02-27 10:14:43 +01:00
monty@mashka.mysql.fi
2fc2d558b0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2004-02-24 19:14:41 +02:00
serg@serg.mylan
4f3062d95f minor omission that effectively disabled my_strtod fixed :) 2004-02-24 12:31:33 +01:00
vva@eagle.mysql.r18.ru
09b44687cb Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2719/mysql-4.1
 2004-02-22 19:07:21 +04:00
guilhem@mysql.com
4352a6f0ea Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-02-22 11:30:58 +01:00
guilhem@mysql.com
5afaf4eaaa Complement to 
ChangeSet 1.1616.23.1
Fix for BUG#1858 "SQL-Thread stops working when using optimize table".
A test for this.
 2004-02-22 11:22:51 +01:00
monty@mashka.mysql.fi
1ae05760ac Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2004-02-22 11:01:28 +02:00
monty@mashka.mysql.fi
7084e3642c Updated results 2004-02-22 10:58:22 +02:00
monty@mashka.mysql.fi
ae6599d5b9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2004-02-22 10:52:43 +02:00
monty@mashka.mysql.fi
43451f3e5b Merge with 4.0 to get fixed tests 2004-02-22 10:04:08 +02:00
monty@mashka.mysql.fi
fa882fd73c Move tests that uses innodb to innodb.test 2004-02-22 09:58:51 +02:00
monty@mashka.mysql.fi
3b83cce5eb merge with 4.0 2004-02-22 09:50:59 +02:00
monty@mashka.mysql.fi
e1bc99c131 After merge fixes 
Fixed wrong test of database name (affected optimization of ORDER BY)
 2004-02-22 08:09:32 +02:00
serg@serg.mylan
815eba6ab9 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-02-22 00:20:09 +01:00
serg@serg.mylan
bcd14123bc ftb +(+(many -parens)) bug fixed 2004-02-22 00:19:36 +01:00
serg@serg.mylan
49429da988 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-02-20 23:18:32 +01:00
bell@sanja.is.com.ua
0af6983ed0 fixed comparation of tables/database names with --lower_case_table_names (BUG#2880) 2004-02-20 22:44:54 +02:00
serg@serg.mylan
7ff24eb01f longer myisam keys 2004-02-20 20:38:34 +01:00
monty@mashka.mysql.fi
494e43c1f5 merge with 4.0 to get security fixes and latest bug fixes 2004-02-20 17:43:02 +02:00
vva@eagle.mysql.r18.ru
38a72a162a fixed for BUG #2719 "Heap tables status shows wrong or missing data" 2004-02-20 00:33:16 +04:00
Sinisa@sinisa.nasamreza.org
cd0562158a Fix for a bug #2799. 
Multi-table delete's with tables having foreign key constraints
did not return the error.

Also added tests for multi-table updates.
 2004-02-19 19:43:46 +02:00
hf@deer.(none)
9edef96561 Fix for #2237 and #2490 (analyze and check for RTree keys) 
Now checking of the RTree keys works without errors.
Worklog entry about appropriate checkup's routine for the RTree added
 2004-02-19 17:22:38 +04:00
bell@sanja.is.com.ua
14b9fa3588 revision of fix_fields() calls (BUG2838) 2004-02-18 01:08:52 +02:00
serg@serg.mylan
6af8a93052 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-02-17 17:07:14 +01:00
serg@serg.mylan
b8e161be4b if a key length exceeds the supported maximum and it is safe to auto-decrease it, do it. 2004-02-17 16:57:39 +01:00
monty@mysql.com
0c68e80609 Fix test results 2004-02-17 14:20:04 +02:00
bell@sanja.is.com.ua
f42deb58e6 changed to moderm syntax (after merge fix) 2004-02-17 02:26:35 +02:00
bell@sanja.is.com.ua
f4d1ee971b merge 2004-02-17 01:52:33 +02:00
monty@mysql.com
e9315f984d Changed wellformedlen to well_formed_len 
Fixed that blobs >16M can be inserted/updated
Fixed bug when doing CREATE TEMPORARY TABLE ... LIKE
 2004-02-17 01:35:17 +02:00
bell@sanja.is.com.ua
e6de937e0d 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-02-17 01:17:41 +02:00
bell@sanja.is.com.ua
3f86f10a57 ulternative bugfix for BUG#2508 and fix for BUG#2809 - every table has its own TABLE structure 2004-02-17 01:14:51 +02:00
serg@serg.mylan
de240a1ce2 ft_boolean_syntax made changeable 2004-02-16 18:53:00 +01:00
ram@gw.mysql.r18.ru
b55cf65bbd fix for the bug #2786 incorrect precedence for XOR operator 2004-02-16 19:43:43 +04:00
pem@mysql.com
5f5da75c65 Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2004-02-16 12:47:47 +01:00
monty@mysql.com
050af89dd8 Merge with public tree 2004-02-16 10:31:05 +02:00
monty@mysql.com
d1d48a9dd5 Merge with 4.0 to get fix for mysqlbinlog 2004-02-16 10:15:52 +02:00
monty@mysql.com
f43093ec0e After merge fixes 
Added more DBUG statements
Ensure that we are comparing end space with BINARY strings
Use 'any_db' instead of '' to mean any database. (For HANDLER command)
Only strip ' ' when comparing CHAR, not other space-like characters (like \t)
 2004-02-16 10:03:25 +02:00
serg@serg.mylan
15249d6a72 bug#2708 
test results updated
 2004-02-15 20:36:12 +01:00
serg@serg.mylan
03ffb63f08 no dots in the error messages! 
--disable-warning in union.test
 2004-02-15 19:16:38 +01:00
serg@serg.mylan
abc9ef9770 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-02-15 18:35:06 +01:00
vva@eagle.mysql.r18.ru
9585dd63df Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2705/mysql-4.1
 2004-02-15 21:35:05 +04:00
serg@serg.mylan
e9c46aaf80 REVOKE ALL PRIVILEGES, GRANT FROM user_list 
is changed to a more consistent
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user_list.
Bug #2642
 2004-02-15 17:59:52 +01:00
Sinisa@sinisa.nasamreza.org
d43f102020 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-02-14 20:24:49 +02:00
hf@deer.(none)
6e0cda9f65 error code changed in union.test 2004-02-14 21:27:09 +04:00
bell@sanja.is.com.ua
06410f41b4 changed error code 2004-02-14 18:53:24 +02:00
Sinisa@sinisa.nasamreza.org
eb83bb374a Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-02-14 15:08:32 +02:00
bell@sanja.is.com.ua
59156e2646 fixed test results broken by sombody 2004-02-14 13:48:54 +02:00
bell@sanja.is.com.ua
7626ab603e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
 2004-02-14 13:06:04 +02:00
vva@eagle.mysql.r18.ru
bdf696d0a4 fixed bug #2705 "mysqldump --tab extra output" 2004-02-14 01:21:46 +04:00
pem@mysql.comhem.se
8f410d5165 Post-merge fix. 2004-02-13 18:28:58 +01:00
pem@mysql.com
5faf244b30 Merge mysql.com:/home/pem/work/mysql-4.1 
into mysql.com:/home/pem/work/mysql-5.0-merge
 2004-02-13 17:39:00 +01:00
monty@mysql.com
fb8f27f017 Always use libtool with "--preserve-dup-deps" 
Always use all LOAD DATA options in replication.
Fixed problem in mysqlbinlog where LOAD DATA options could be overwritten.
 2004-02-13 16:05:09 +02:00
bar@bar.intranet.mysql.r18.ru
3bdb96d33e Bug #2699 UTF8 breaks primary keys for cols > 85 characters 2004-02-13 17:58:02 +04:00
vva@eagle.mysql.r18.ru
da662e9d84 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2898/mysql-4.0
 2004-02-13 02:25:50 +04:00
bell@sanja.is.com.ua
260ea51ab1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
 2004-02-12 23:50:03 +02:00
vva@eagle.mysql.r18.ru
c57ca85da5 fixed mistake after merge in mysql-test/r/mysqldump.result 2004-02-13 01:50:02 +04:00
bell@sanja.is.com.ua
5ef05f4284 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
 2004-02-12 22:33:30 +02:00
vva@eagle.mysql.r18.ru
50076a5d09 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2593/mysql-4.1
 2004-02-13 00:31:39 +04:00
vva@eagle.mysql.r18.ru
5b369431f1 fixed copying of color in SEL_ARG::clone (fixed bug #2968) 2004-02-12 23:45:39 +04:00
pem@mysql.com
26955036ef Merge mysql.com:/usr/local/bk/mysql-5.0 
into mysql.com:/home/pem/work/mysql-5.0
 2004-02-12 13:52:10 +01:00
pem@mysql.comhem.se
f9e73c7716 Post-merge fixes. 2004-02-11 18:21:55 +01:00
Sinisa@sinisa.nasamreza.org
125fb04b87 merge fixes 2004-02-11 19:15:02 +02:00
bar@bar.intranet.mysql.r18.ru
4e77123079 Bug 2701: Function CHARSET() inconsistency 
CONVERT3 was removed, it was for test purposes,
and rather harmful.
 2004-02-11 16:53:39 +04:00
monty@mysql.com
ce14578909 Merge with 4.0.18 2004-02-11 00:06:46 +01:00
Sinisa@sinisa.nasamreza.org
451e423be4 Fixes for bugs #2508 and #2552 2004-02-10 21:34:25 +02:00
pem@mysql.com
c8585f3283 Merge 4.1 into 5.0. 2004-02-10 18:44:02 +01:00
bar@bar.intranet.mysql.r18.ru
173fbc5228 Bug #2368 Multibyte charsets do not check that incoming data is well-formed 
It was together with the previous but. This test tends to prove it.
 2004-02-10 19:33:04 +04:00
bar@bar.intranet.mysql.r18.ru
0a1ceb667c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2004-02-10 19:33:03 +04:00
vva@eagle.mysql.r18.ru
da8f78a0ad Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2592/mysql-4.1
 2004-02-10 19:33:02 +04:00
vva@eagle.mysql.r18.ru
950b2df9f7 correcting mysql-test/r/mysqldump.result after merge 2004-02-10 19:29:28 +04:00
vva@eagle.mysql.r18.ru
fd03264469 Merge 2004-02-10 18:56:43 +04:00
vva@eagle.mysql.r18.ru
33147e2477 added skiped newline to the end of file mysql-test/t/mysqldump.test 2004-02-10 18:44:27 +04:00
bar@bar.intranet.mysql.r18.ru
5219fc269b http://bugs.mysql.com/bug.php?id=2368 
Multibyte charsets do not check that incoming data is well-formed
 2004-02-10 15:42:46 +04:00
bell@sanja.is.com.ua
bccca8f7cb Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
 2004-02-10 02:24:10 +02:00
guilhem@gbichot2.local
64f1a5e0b3 Fix for the rpl_until.test. 
Don't use --command in tests; use command.
 2004-02-09 23:47:28 +01:00
bell@sanja.is.com.ua
ff0a6e9686 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
 2004-02-09 15:01:51 +02:00
monty@mysql.com
cc78e2d97a Ensure that result from date_format() is binary 
Removed warnings from test suite
 2004-02-09 13:59:41 +01:00
bell@sanja.is.com.ua
74a9ca1991 ufter revview fix (BUG#2120) 2004-02-09 14:44:03 +02:00
monty@mysql.com
3e35cce54d merge 2004-02-09 12:35:01 +01:00
monty@mysql.com
06432eac36 Added --compact to mysqlbinlog 
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned
 2004-02-09 12:31:03 +01:00
bell@sanja.is.com.ua
b99d13582b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-derived2-4.1
 2004-02-09 12:10:12 +02:00
vva@eagle.mysql.r18.ru
cc1ff3c479 fixed bug #2592 mysqldump doesn't quote "tricky" names correctly 2004-02-07 02:22:12 +04:00
vva@eagle.mysql.r18.ru
e8fb5a1d68 1. fixed bug @2593 "SHOW CREATE TABLE doesn't properly double quotes" 
2. added automatic quotation of keywords in SHOW CREATE TABLE
 2004-02-07 00:57:22 +04:00
konstantin@mysql.com
cfcc5a5b29 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/kostja/mysql/mysql-4.0-merge
 2004-02-06 19:57:12 +03:00
vva@eagle.mysql.r18.ru
0333f7b10f fixed bug #1378 "mysqlbinlog for remote host is broken" 2004-02-06 20:57:11 +04:00
konstantin@mysql.com
8090b61fcb 3.23 -> 4.0 merge: after merge fixes 2004-02-06 16:40:44 +03:00
bar@bar.intranet.mysql.r18.ru
d13ad0822e Problem fix: 
http://bugs.mysql.com/bug.php?id=2366
Wrong utf8 behaviour when data is trancated
 2004-02-06 16:59:25 +04:00
konstantin@mysql.com
2a4cfe8b4f merge 3.23 -> 4.0, 2003/02/06 2004-02-06 15:23:41 +03:00
konstantin@mysql.com
2093624a73 Fix for bug #2628 "ALTER TABLE destroys table and reports success" 2004-02-06 14:28:57 +03:00
lenz@mysql.com
e306876fe1 - renamed mysql-test/t/init_file.sql to mysql-test/std_data/init_file.dat 
so it gets picked up by "make dist" and updated init_file test accordingly.
 2004-02-05 23:36:54 +01:00
monty@mysql.com
480b082cf4 merge 2004-02-05 18:14:48 +01:00
vva@eagle.mysql.r18.ru
d0754dd720 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2526/mysql-4.0
 2004-02-05 18:14:39 +04:00
vva@eagle.mysql.r18.ru
128751d3f7 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2526/mysql-4.0
 2004-02-05 17:53:46 +04:00
vva@eagle.mysql.r18.ru
fedeafaef0 code cleanup 2004-02-05 17:52:41 +04:00
bell@sanja.is.com.ua
930db43eb0 correct processing of rand() in subqueries with static tables (BUG#2645) 2004-02-05 12:32:22 +02:00
monty@mysql.com
7df839e757 Added testing of pthread_key_delete (to fix compile problem on SCO) (Bug #2461) 
DROP DATABASE now assumes RAID directories are in hex. (Bug #2627)
Don't increment 'select_full_range' and similar statistics for EXPLAIN queries. (Bug #2506)
Test in configure if pthread_key_delete() exists (to fix compile problem on SCO) (Bug #2461)
 2004-02-05 09:12:23 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
d0d54abcf2 Bug#2634 
Emit "TYPE=" for 4.0 and 3.23 compatible modes
 2004-02-05 02:30:28 +00:00
bell@sanja.is.com.ua
7d8e30c369 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.1
 2004-02-04 23:45:48 +02:00
vva@eagle.mysql.r18.ru
7769e5a677 added checking for bootstrap in select_send::send_data 
(fixed bug #2526 "--init-file crashes MySQL if contains large select")
Such checking usually works in send_ok, send_eof, but in this case large 
result causes interim flushing.
 2004-02-04 21:35:20 +04:00
serg@serg.mylan
069f6892f7 beautify SHOW INDEX 2004-02-04 17:42:18 +01:00