database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-19 19:03:26 +03:00
Code Activity
10,743 Commits 3,280 Branches 1,098 Tags
a5af8f1f808a46a958ff665e250b51acb3204693
Commit Graph

5450 Commits

Author SHA1 Message Date
unknown
a5af8f1f80 warning comment 2004-01-26 20:16:37 +01:00
unknown
01d42f79e6 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2004-01-26 19:39:46 +01:00
unknown
9a1d21f0d1 fix for BUG#2516: "SLAVE START may crash mysqld" 
sql/sql_yacc.yy:
  Enable UNTIL in SLAVE START; bzero() fixes the bug.
 2004-01-26 19:39:00 +01:00
unknown
b4ba28470b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.1.long
 2004-01-26 20:32:14 +04:00
unknown
0a3ca2f640 Fix for bug#2505: MySQL reports "out of memory" 
when DROP USER if --skip-grant-tables
 2004-01-26 20:31:38 +04:00
unknown
0314c772b5 Fixed a bug in slave-compressed-protocol. Using this option 
from command line did not work.
 2004-01-26 15:12:52 +02:00
unknown
557bb526d7 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_yacc.yy:
  Auto merged
 2004-01-24 15:57:48 +02:00
unknown
8cfd6d0c1d mysqld.cc: 
Fixed a typo bug.


sql/mysqld.cc:
  Fixed a typo bug.
 2004-01-23 21:26:13 -08:00
unknown
15ed4347b2 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-01-23 20:08:02 -08:00
unknown
7580623ec7 define name fixed 
sql/lex.h:
  Wrong define name
 2004-01-23 20:52:35 +04:00
unknown
2e5dfc5ec4 Error message added 2004-01-23 20:03:42 +04:00
unknown
a6132c6f0a Conflicts resolved 
sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
include/mysqld_error.h:
  merging
sql/share/english/errmsg.txt:
  merging
 2004-01-23 20:00:10 +04:00
unknown
87b3ca5fe0 SCRUM 
WL#1163 (Make spatial code separable)
fixes before the push


include/my_global.h:
  Temporary place for these defines
include/mysqld_error.h:
  ER_FEATURE_DISABLED definition
sql/item_geofunc.cc:
  #ifdef HAVE_SPATIAL moved to the better place
sql/share/english/errmsg.txt:
  Message for ER_FEATURE_DISABLED
 2004-01-23 19:54:22 +04:00
unknown
214c178f17 SCRUM 
wl #1163 (Make spatial code optional)
Patch I cleaned with Serg & Monty's suggestions


sql/gen_lex_hash.cc:
  mysql_priv.h was included for SYM_GROUP declaration
sql/lex.h:
  sym_group_xxx made global so we can use texts from them
  throughout the code
sql/lex_symbol.h:
  SYM_GROUP declaration moved to mysql_priv.h
sql/mysql_priv.h:
  declarations about SYM_GROUP
sql/sql_table.cc:
  sym_group_xxx objects used instead of text constants
  a couple of HAVE_SPATIAL removed
sql/sql_yacc.yy:
  sym_group_xxx used instead of text constants
  some duplicated code restructured
  MYF(0) parameters removed from net_printf calls
 2004-01-23 16:02:57 +04:00
unknown
fcb0c7f5ee Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-01-22 22:44:05 +02:00
unknown
989cb2f29b Fix for a bug #2422, where CONVERT(expr, cast) was masked by 
CONVERT(expr, expr, expr);


mysql-test/t/mysqldump.test:
  fix for my previous result fix of Jani's changes.
 2004-01-22 22:13:24 +02:00
unknown
2880b07f75 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
 2004-01-22 14:46:54 +01:00
unknown
d0123ed5d2 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-01-22 14:18:12 +02:00
unknown
4d2a1ed59e enforcing coding style to cause an intentional merge conflict with 4.0 2004-01-22 12:55:37 +01:00
unknown
22ae7f3797 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-01-21 12:38:23 -08:00
unknown
63f3d3d232 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2004-01-21 15:48:32 +04:00
unknown
aa672d63f3 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.clean
 2004-01-21 15:48:31 +04:00
unknown
b5567d1503 yet another cleanup()-related fix 
sql/sql_lex.cc:
  We need these to be clean.
  Otherwise restoring of the order_list and group_list could fail
  in mysql_stmt_execute()
 2004-01-21 15:47:47 +04:00
unknown
335ad8f255 sql_string.cc: 
Rewrote to comply the coding style


sql/sql_string.cc:
  Rewrote to comply the coding style
 2004-01-21 14:32:02 +04:00
unknown
cf240e4ee8 Further fixes for 2390: ucs2 alignment 2004-01-21 14:15:19 +04:00
unknown
c3cf3d2820 Merge 
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/derived.result:
  SCCS merged
mysql-test/t/derived.test:
  e
  merge
 2004-01-20 19:23:28 +02:00
unknown
7a1a5cd2d8 for multy-delete command used same algorithm of table reference (alias) 
mysql-test/t/multi_update.test:
  new results of changed multi-delete
mysql-test/t/update.test:
  new results of changed multi-delete
mysql-test/r/multi_update.result:
  new results of changed multi-delete
mysql-test/r/update.result:
  new results of changed multi-delete
 2004-01-20 19:16:18 +02:00
unknown
fe21bfb60a Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-4.1.1676


sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
 2004-01-20 21:00:29 +04:00
unknown
9768dc84c8 Pack of changes about 'cleanup()'-s 
Some errorneous code trimmed


sql/item.cc:
  initialization of the Item_type_holder::orig_item added
sql/item.h:
  No use to call cleanup() in ~Item
  this only calls Item::cleanup()
  
  We should use item->delete_self() instead of 'delete item' now
  
  Code added to restore Item_type_holder::item_type value
sql/item_row.h:
  this cleanup is wrong
sql/item_sum.cc:
  initialization added
sql/item_sum.h:
  Item_xxx& -> Item_xxx*
sql/sql_parse.cc:
  delete item -> item->delete_self()
 2004-01-20 20:55:47 +04:00
unknown
862b062275 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-01-20 17:49:10 +02:00
unknown
644a5146c3 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1 
into rurik.mysql.com:/home/igor/mysql-4.1
 2004-01-19 23:00:46 -08:00
unknown
b89abbf8a1 more clear (grammar mistake) 2004-01-19 23:34:40 +03:00
unknown
eead0c1b82 More comments to THD::lock and THD::locked_tables commented 2004-01-19 23:34:39 +03:00
unknown
3b98955a5c Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2310/mysql-4.1
 2004-01-20 00:34:38 +04:00
unknown
7db61ce021 Fixed bug #2310 "INET_ATON handles short-forms addresses incorrectly" 
mysql-test/r/func_misc.result:
  added new test for inet_aton (short-forms addresses)
mysql-test/t/func_misc.test:
  added new test for inet_aton (short-forms addresses)
sql/item_func.cc:
  Change Item_func_inet_aton::val_int to parse short-forms addresses correctly
 2004-01-20 00:32:25 +04:00
unknown
b44c819bb6 Merge deer.(none):/home/hf/work/mysql-4.1.clean 
into deer.(none):/home/hf/work/mysql-4.1.1676


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2004-01-19 21:06:27 +04:00
unknown
584e137887 Code cleanup 
Superfluous line removed


sql/sql_prepare.cc:
  Line is not needed
 2004-01-19 21:05:26 +04:00
unknown
c8eff1773e Code cleanup (working on PS & cleanup() code) 
Item & changed with Item* in Item_xxx constructors
tables_list.first -> get_table_list()


sql/item.cc:
  Item& -> Item*
sql/item.h:
  Item& -> Item*
sql/item_cmpfunc.cc:
  Item& -> Item*
sql/item_cmpfunc.h:
  Item& -> Item*
sql/item_func.cc:
  Item& -> Item*
sql/item_func.h:
  Item& -> Item*
sql/item_sum.cc:
  Item& -> Item*
sql/item_sum.h:
  Item& -> Item*
sql/item_uniq.h:
  Item& -> Item*
sql/sql_prepare.cc:
  Code cleanup
sql/sql_select.cc:
  Item& -> Item*
 2004-01-19 19:53:25 +04:00
unknown
d2b5444181 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1


sql/item.h:
  Auto merged
 2004-01-19 19:21:07 +04:00
unknown
162f1dc5e6 UCS-2 aligning 0xAA -> 0x00AA 2004-01-19 19:16:30 +04:00
unknown
9af09d1266 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-01-19 14:23:18 +01:00
unknown
06de76aec5 field length convertion (bytes->chars) should be done with rounding UP. 2004-01-19 14:22:38 +01:00
unknown
3991a1d0d1 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-01-19 14:15:40 +02:00
unknown
2f7bf967fd Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b2182


client/mysqldump.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
 2004-01-19 13:00:51 +04:00
unknown
cf2b6edaad Fix deprecation warning - database_engine => storage_engine 
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
 2004-01-18 22:30:35 +00:00
unknown
2d6ff22e94 merge fixes 2004-01-17 17:18:32 +02:00
unknown
aa35b8c1b1 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-insert-4.1


sql/sql_derived.cc:
  Auto merged
 2004-01-17 15:28:56 +02:00
unknown
04bf624289 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-exists-4.1
 2004-01-17 14:43:56 +02:00
unknown
e6213fe4e7 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ft_derived-4.1


sql/sql_derived.cc:
  Auto merged
 2004-01-17 14:03:22 +02:00
unknown
fb006367e5 merge 
sql/mysql_priv.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_help.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
 2004-01-17 13:13:48 +02:00