1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Commit Graph

11730 Commits

Author SHA1 Message Date
922818a798 Updated tests after merge
mysql-test/r/alter_table.result:
  Updated tests
mysql-test/t/alter_table.test:
  Updated tests
2004-03-25 23:08:42 +02:00
f6e33d67e1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


sql/item_func.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
2004-03-25 22:18:31 +02:00
054d2de499 Cleanups & safety fixes
include/mysql.h:
  cleanup of load data infile patch
libmysql/libmysql.c:
  cleanup of load data infile patch
myisam/mi_search.c:
  Added missing assert.h
mysql-test/r/func_time.result:
  Make test more secure
mysql-test/t/func_time.test:
  Make test more secure
sql/item.cc:
  restore to use str_value in item::save_in_field
sql/item.h:
  Simple cleanup
sql/item_cmpfunc.cc:
  Safety fix
sql/item_cmpfunc.h:
  Simple optimization
sql/item_func.cc:
  Updated comment
sql/sql_base.cc:
  Simple optimization
sql/sql_select.cc:
  Simple optimization
sql/sql_union.cc:
  safey fixes
2004-03-25 22:11:22 +02:00
7f0a632c19 merge with 3.23
BitKeeper/etc/logging_ok:
  auto-union
scripts/mysqlbug.sh:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/t/alter_table.test:
  Merge code with 3.23
sql/nt_servc.cc:
  use original code
2004-03-25 22:05:09 +02:00
143e585a7f Improved test case
service backport from 4.0


mysql-test/t/alter_table.test:
  Improved test case
sql/nt_servc.cc:
  service backport from 4.0
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-03-25 21:52:25 +02:00
d31bb74ade Merge fix.
sql/sql_yacc.yy:
  Auto merged
tests/client_test.c:
  Merge fix (two new test cases at the same time).
2004-03-25 17:48:00 +01:00
df06466976 Fixed BUG#3117: LAST_INSERT_ID() works incorrectly inside stored procedure.
This turned out to be a problem for prepared statements as well; the id was
evaluated once, at parse time.


mysql-test/r/auto_increment.result:
  Updated results after bugfix in last_insert_id().
mysql-test/r/query_cache.result:
  Updated results after bugfix in last_insert_id().
mysql-test/r/variables.result:
  Updated results after bugfix in last_insert_id().
sql/item_func.cc:
  Fixed bug in last_insert_id(); get id at each evaluation (and not in the parser).
  Renamed the class Item_func_set_last_insert_id too, since it's not only for setting.
sql/item_func.h:
  Fixed bug in last_insert_id(); get id at each evaluation (and not in the parser).
  Renamed the class Item_func_set_last_insert_id too, since it's not only for setting.
sql/sql_yacc.yy:
  Fixed bug in last_insert_id(); get id at each evaluation (and not in the parser).
  Renamed the class Item_func_set_last_insert_id too, since it's not only for setting.
tests/client_test.c:
  Test case for last_insert_id() in prepared statements.
2004-03-25 17:42:13 +01:00
d78cb89981 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1


myisam/mi_check.c:
  Auto merged
sql/field.cc:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
2004-03-25 15:05:42 +02:00
3c46af6cf4 BTREE-indexes in HEAP tables can now be used to optimize ORDER BY
Don't read character set files if we are using only the default charset. In most cases the user will not anymore get a warning about missing character set files
Compare strings with space extend instead of space strip. Now the following comparisons holds:  "a" == "a " and "a\t" < "a". (Bug #3152).
Note: Because of the above fix, one has to do a REPAIR on any table that has an ascii character < 32 last in a CHAR/VARCHAR/TEXT columns.


heap/hp_hash.c:
  Comments and DBUG information
include/my_handler.h:
  Updated prototype for mi_compare_text
myisam/ft_boolean_search.c:
  Updated calls to mi_compare_text
myisam/ft_nlq_search.c:
  Updated calls to mi_compare_text
myisam/ft_parser.c:
  Updated calls to mi_compare_text
myisam/ft_stopwords.c:
  Updated calls to mi_compare_text
myisam/ft_update.c:
  Updated calls to mi_compare_text
myisam/mi_check.c:
  Updated calls to mi_compare_text
myisam/mi_search.c:
  Changed all string comparisons that removed end space to instead extend the shorter string with space
myisam/mi_unique.c:
  Updated calls to mi_compare_text
myisam/mi_write.c:
  Updated calls to mi_compare_text
myisam/myisam_ftdump.c:
  Removed compiler warning
mysql-test/r/ctype_collate.result:
  Fixed wrong result
mysql-test/r/heap_btree.result:
  More tests
mysql-test/t/heap_btree.test:
  more tests
mysys/charset.c:
  Don't read charsets if we are only using default charset
  Don't require 'init_available_charsets' to succeed.
mysys/my_handler.c:
  Compare strings with space extend instead of space strip
mysys/tree.c:
  Fixed code to get better results for range optimzier
sql/field.cc:
  Compare strings with space extend instead of space strip
sql/filesort.cc:
  Compare strings with space extend instead of space strip
sql/ha_heap.cc:
  Created bit map for keys that are using BTREE. This allows the optimzer to use BTREE's for sorting
sql/ha_heap.h:
  Created bit map for keys that are using BTREE. This allows the optimzer to use BTREE's for sorting
strings/ctype-big5.c:
  Compare strings with space extend instead of space strip
strings/ctype-czech.c:
  Indentation cleanup. Should be fixed to use space extend
strings/ctype-gbk.c:
  Compare strings with space extend instead of space strip
strings/ctype-latin1.c:
  Compare strings with space extend instead of space strip
  Added missing my_hash_sort_latin1_de function
strings/ctype-mb.c:
  For binary strings, don't remove end space when comparing
strings/ctype-simple.c:
  Compare strings with space extend instead of space strip
strings/ctype-sjis.c:
  Compare strings with space extend instead of space strip
strings/ctype-tis620.c:
  Added comments that we should fix end space handling
strings/ctype-ucs2.c:
  indentation fixes
strings/ctype-utf8.c:
  Added comments that we should fix end space handling
strings/ctype-win1250ch.c:
  Added comments that we should fix end space handling
2004-03-25 15:05:01 +02:00
8711aa1635 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-3.23
into sanja.is.com.ua:/home/bell/mysql/bk/work-alter-3.23
2004-03-25 15:00:41 +02:00
bdb874226e Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-alias-4.1


sql/sql_lex.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
2004-03-25 14:40:36 +02:00
5a685dc81f bugs-aware post-commit trigger
cleanup (VERSION variable)
2004-03-25 13:29:12 +01:00
7674fd064c Bug #3290 [Ver]: Can't convert sjis&ujis half-width katakana correctly
UJIS part fix
2004-03-25 16:15:52 +04:00
fb9b5fd9a4 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-25 11:33:41 +01:00
65bed530a8 #3290: Can't convert sjis&ujis half-width katakana correctly 2004-03-25 14:29:56 +04:00
f72dd18af8 shared IO_CACHE: protection against remove_io_share in a wrong time
bug#3134


BitKeeper/deleted/.del-post-incoming~9f2168f531f09f3b:
  Delete: BitKeeper/triggers/post-incoming
BitKeeper/deleted/.del-post-outgoing~1dd3d8f0f6e8f3cd:
  Delete: BitKeeper/triggers/post-outgoing
2004-03-25 11:22:01 +01:00
92a50d2b69 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-25 12:50:23 +04:00
e63210a280 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3266
2004-03-25 11:38:53 +04:00
85df0d0ddb Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3264
2004-03-25 11:36:52 +04:00
62ee5c21ff I didn't get a couple of system variables alphabetized correctly. 2004-03-24 20:30:49 -06:00
d90794f7f2 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-24 15:28:14 -06:00
7084ad6a73 protection against "ln -s /etc/passwd /tmp/failed-mysql-bugreport" 2004-03-24 20:27:07 +01:00
2f74974b05 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-24 17:24:08 +01:00
6573112f67 accorting to the manual, when neither GLOBAL or SESSION in SET
is specified, the default is SESSION.
2004-03-24 16:33:47 +01:00
72ebff9d9d Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-24 17:04:58 +02:00
d94e4be36e Fix for #3067
Shouldn't be moved to 4.1


myisam/mi_check.c:
  only set key_map if necessary
2004-03-24 19:04:57 +04:00
f015379b53 SHOW PRIVILEGES updated (Bug#3227)
Docs/README.1st:
  Change mode to -rw-rw-r--
2004-03-24 14:44:31 +01:00
8b4720e7c1 ctype-uca.c:
Conditional compilation


strings/ctype-uca.c:
  Conditional compilation
2004-03-24 16:18:56 +04:00
665a255dee Unicode Collation Algorithm subset implementation 2004-03-24 16:16:08 +04:00
aadc499aea fixed function name in a comment 2004-03-24 11:54:58 +02:00
f5292a4487 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
2004-03-23 22:48:30 -06:00
5a88bc3c87 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-conf-4.0


mysys/default.c:
  Auto merged
2004-03-23 22:11:50 +02:00
57c48a22b6 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-03-23 19:26:03 +01:00
d7801e0624 comment 2004-03-23 19:25:30 +01:00
ddbbf1ebde fixed debug information 2004-03-23 19:28:18 +02:00
4a8dcd750c removed unneeded bzero 2004-03-23 19:24:35 +02:00
9079dc1a66 Fix for #3264 (FROM_DAYS doesn't work properly in range comparison)
Item_func_from_days::get_date didn't change 'hr', 'min' and some
other fields of incoming ltime, so they got random values.

bzeroing of the ltime added


mysql-test/r/func_time.result:
  appropriate test result
mysql-test/t/func_time.test:
  test case
sql/item_timefunc.cc:
  cleaning ltime added
2004-03-23 21:10:23 +04:00
1744d26c95 used right table for grants check (BUG#3270)
mysql-test/t/alter_table.test:
  test for BUG#3270 added
2004-03-23 17:15:20 +02:00
d8c5358115 uca-dump.c:
Don't dump default implicit weights


strings/uca-dump.c:
  Don't dump default implicit weights
2004-03-23 18:29:07 +04:00
256321fafa Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2004-03-23 15:25:45 +01:00
152df24f76 small addition to the fix for #3188
dropping of tables added to the testcase


mysql-test/r/subselect.result:
  result fixed
mysql-test/t/subselect.test:
  dropping added
2004-03-23 18:25:44 +04:00
9d4c775ce4 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3266


sql/item.cc:
  Auto merged
2004-03-23 17:58:55 +04:00
b7b69c5d2f Fix for #3266 (garbled TEXT fields as a result of CREATE TABLE SELECT)
Problem is that Item::save_in_field modifies str_value member
 before it calls val_str but Item_copy_string::val_str just returns
this str_value as the result.
I added local String variable to the Item::save_in_field


mysql-test/r/create.result:
  appropriate test result
mysql-test/t/create.test:
  test case
sql/item.cc:
  local variable added to keep the result
2004-03-23 17:57:14 +04:00
c0a9df1aae correct support for a mix of UNION/UNION ALL in the same query.
Bug#1428
2004-03-23 14:43:24 +01:00
a36185af9a fixed union with prepared statement bug found by Konstantin
sql/sql_lex.cc:
  initialisation for safety
sql/sql_union.cc:
  item list should be saved in statement memory
tests/client_test.c:
  test suite
2004-03-23 14:26:54 +02:00
6853f60cf7 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2004-03-23 14:04:32 +02:00
b02e83becf Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3188


sql/item.cc:
  Auto merged
2004-03-23 13:09:50 +04:00
a25455eea5 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.3067
2004-03-23 11:58:04 +04:00
03f5ebf1b0 Added LOCAL INFILE callback function support.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-03-22 19:58:49 -05:00
a99039f8bf Changes to project files precipitated from 4.1 test builds.
BitKeeper/deleted/.del-libmysql.def~f5dffcb3ed925d28:
  Delete: VC++Files/libmysql/libmysql.def
VC++Files/innobase/innobase.dsp:
  'com' module no longer exists.
VC++Files/strings/MASM6x/strings.dsp:
  Add strnlen
VC++Files/strings/strings.dsp:
  Add strnlen
2004-03-22 14:30:30 -07:00