mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
11644 commits 2778 branches 343 tags 1.6 GiB
Commit graph

11644 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
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
unknown
7674fd064c Bug #3290 [Ver]: Can't convert sjis&ujis half-width katakana correctly 
UJIS part fix
 2004-03-25 16:15:52 +04:00
unknown
65bed530a8 #3290: Can't convert sjis&ujis half-width katakana correctly 2004-03-25 14:29:56 +04:00
unknown
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
unknown
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
unknown
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
unknown
62ee5c21ff I didn't get a couple of system variables alphabetized correctly. 2004-03-24 20:30:49 -06:00
unknown
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
unknown
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
unknown
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
unknown
f015379b53 SHOW PRIVILEGES updated (Bug#3227) 
Docs/README.1st:
  Change mode to -rw-rw-r--
 2004-03-24 14:44:31 +01:00
unknown
8b4720e7c1 ctype-uca.c: 
Conditional compilation


strings/ctype-uca.c:
  Conditional compilation
 2004-03-24 16:18:56 +04:00
unknown
665a255dee Unicode Collation Algorithm subset implementation 2004-03-24 16:16:08 +04:00
unknown
aadc499aea fixed function name in a comment 2004-03-24 11:54:58 +02:00
unknown
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
unknown
ddbbf1ebde fixed debug information 2004-03-23 19:28:18 +02:00
unknown
4a8dcd750c removed unneeded bzero 2004-03-23 19:24:35 +02:00
unknown
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
unknown
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
unknown
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
unknown
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
unknown
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
unknown
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
unknown
c0a9df1aae correct support for a mix of UNION/UNION ALL in the same query. 
Bug#1428
 2004-03-23 14:43:24 +01:00
unknown
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
unknown
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
unknown
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
unknown
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
unknown
b4312dc5e0 Merge gweir@build.mysql.com:/home/bk/mysql-4.1 
into greg-laptop.:C:/cygwin/bk/mysql-4.1


sql/item.h:
  Auto merged
 2004-03-22 13:42:22 -07:00
unknown
afebff3753 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1
 2004-03-22 14:39:09 -06:00
unknown
aa102ee3c1 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.3067
 2004-03-22 21:38:32 +04:00
unknown
a0d0da6f26 Fix for #3067 (REPAIR TABLE reenables disabled keys) 
myisam/mi_check.c:
  we only restore key_map if it's required
mysql-test/r/repair_part1.result:
  appropriate test result
mysql-test/t/repair_part1.test:
  test case
 2004-03-22 21:34:36 +04:00
unknown
78b4ba746b 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
 2004-03-22 18:19:02 +02:00
unknown
a0dce8c864 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean


sql/item.cc:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
 2004-03-22 17:48:29 +04:00
unknown
560fc0379b aliases should be compared with my_strcasecmp (BUG#3251) 
some db comparison code cleupup
removed compiler warnings


mysql-test/r/lowercase_table.result:
  test for BUG#3251
mysql-test/t/lowercase_table.test:
  test for BUG#3251
sql/item.cc:
  simple strcmp can be used for db name comparison
sql/set_var.h:
  changed initialisation order to satisfy compiler
sql/sql_cache.cc:
  simple strcmp can be used for db name comparison
sql/sql_db.cc:
  better use special cherset for files
sql/sql_parse.cc:
  simple strcmp can be used for db name comparison
  aliases should be compared with my_strcasecmp
sql/sql_select.cc:
  aliases should be compared with my_strcasecmp
 2004-03-22 15:43:13 +02:00
unknown
8aa866d94d uca-dump.c: 
new file
 2004-03-22 15:14:12 +04:00
unknown
fb5d4bb51b .del-uca-dump.c~da786d5a909db27a: 
Delete: mysys/uca-dump.c


BitKeeper/deleted/.del-uca-dump.c~da786d5a909db27a:
  Delete: mysys/uca-dump.c
 2004-03-22 15:13:47 +04:00
unknown
fdcf1401ca Changes in Windows project files instituted after latest 4.1 test build. 
VC++Files/mysys/mysys.dsp:
  Add my_gethwaddr, my_getsystime
VC++Files/sql/mysqld.dsp:
  Remove opt_ft.cpp (no longer exists)
 2004-03-21 18:03:34 -07:00
unknown
a8f9146c9c Some SHOW STATUS lines were in non-alphabetic order. 2004-03-21 15:58:08 -06:00
unknown
afbf1bbaa4 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


sql/sql_parse.cc:
  Auto merged
 2004-03-21 16:39:37 +02:00
unknown
5764e4f684 after merge changes 2004-03-21 16:39:14 +02:00
unknown
7b31e57f56 Be picky. 2004-03-20 18:37:15 -06:00
unknown
81836c8ec3 more sys_var_str fixes 
mysql-test/r/variables.result:
  more tests
mysql-test/t/variables.test:
  more tests
sql/set_var.cc:
  don't crash on NULL
 2004-03-20 17:08:01 +01:00
unknown
1f08d0b4bd sys_var_str.value is never NULL 2004-03-20 15:56:20 +01:00
unknown
b399754780 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/set_var.cc:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
 2004-03-20 14:36:49 +01:00
unknown
eb3ded5665 select @@smth=@@sys_str_var crash fixed 
mysql-test/r/variables.result:
  new test
mysql-test/t/ctype_utf8.test:
  typos fixed
mysql-test/t/variables.test:
  new test
sql/mysqld.cc:
  sys_str_var->value must be not NULL
sql/set_var.cc:
  initialize sys_str_var->value from a constructor
sql/set_var.h:
  initialize sys_str_var->value from a constructor
 2004-03-20 14:36:00 +01:00
unknown
9876b6a7ac 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-20 14:36:58 +02:00
unknown
7699bb4784 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


sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
 2004-03-20 13:37:30 +02:00
unknown
f379d7b172 after review changes 
sql/item.cc:
  removed double_fix & already_fixed in Item_field
sql/item.h:
  added quick_fix_field() for cases when we are sure that no need full fix_field processing
  fixed neg() method for numeric constants to have the same logic as constant parser
  Item_null, Item_real, ... are constant which are fixed by creation
sql/item_cmpfunc.h:
  right fix_fields in and_conds call
sql/item_func.cc:
  changed Item_field constructor call
  fix_field emulation call
sql/item_strfunc.cc:
  correct layout
sql/item_subselect.cc:
  correct layout
  changed Item_field constructor call
sql/item_sum.cc:
  changed Item_field constructor call
sql/item_sum.h:
  changed Item_field constructor call
sql/sql_base.cc:
  fixed layout
  right fix_fields calls
sql/sql_help.cc:
  changed Item_field constructor call
sql/sql_load.cc:
  changed Item_field constructor call
sql/sql_parse.cc:
  constant changed
sql/sql_select.cc:
  fixed layout
  fix_field emulation insted of real fix_fields call
sql/sql_show.cc:
  changed Item_field constructor call
sql/sql_union.cc:
  changed Item_field constructor call
  double_fix removed
sql/sql_update.cc:
  renamed variable, fixed layout
sql/sql_yacc.yy:
  typo fixed
  fix_fields emulation calls
  hegation of numbers fixed
 2004-03-20 13:36:26 +02:00
unknown
2d20eddcbb Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-03-20 12:50:12 +02:00