mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity
31,724 commits 3,590 branches 380 tags 1.7 GiB
Commit graph

31,724 commits

This branch
This branch
All branches
Author SHA1 Message Date
unknown
4abe4b1717 sql_view.cc: 
After merge fix


sql/sql_view.cc:
  After merge fix
 2006-08-09 06:46:06 +04:00
unknown
a5ccdea772 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  sunlight.local:/local_work/leak_fix


sql/sql_view.cc:
  Auto merged
 2006-08-09 01:45:42 +04:00
unknown
962d5b4d4e Merge sunlight.local:/home/evgen/bk-trees/mysql-5.0 
into  sunlight.local:/local_work/leak_fix


sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_view.cc:
  Manually merged
 2006-08-09 01:43:11 +04:00
unknown
1e9ebd010a sql_base.cc, unireg.h, sql_lex.h, table.cc, sql_view.h, sql_view.cc: 
Correct memory leak fix


sql/unireg.h:
  Correct memory leak fix
sql/table.cc:
  Correct memory leak fix
sql/sql_view.h:
  Correct memory leak fix
sql/sql_view.cc:
  Correct memory leak fix
sql/sql_lex.h:
  Correct memory leak fix
sql/sql_base.cc:
  Correct memory leak fix
 2006-08-09 00:05:42 +04:00
unknown
9672ef612e Bug#16172 DECIMAL data type processed incorrectly 
issue an error in case of DECIMAL(M,N) if N > M


mysql-test/r/type_newdecimal.result:
  Bug#16172 DECIMAL data type processed incorrectly
  result fix & test case
mysql-test/t/type_newdecimal.test:
  Bug#16172 DECIMAL data type processed incorrectly
  test fix
 2006-08-08 14:40:07 +05:00
unknown
3bb35e0cba bug #20910 (NOT NULL reported as NULL for TIMESTAMP) 
we intentionally reported that for TIMESTAMPS, which isn't right


mysql-test/r/type_timestamp.result:
  result fixed
mysql-test/t/type_timestamp.test:
  testcase added
sql/sql_show.cc:
  remove the check for TIMESTAMP type -
  all types will report 'NO' if they're defined as NOT NULL
 2006-08-08 13:34:27 +05:00
unknown
1cf5669955 result fix 2006-08-08 12:50:05 +05:00
unknown
698bd7c4fa Remove extra whitespace 2006-08-07 19:21:43 +02:00
unknown
d09ba5a874 Add some more code to analyze why the fgets fails. 2006-08-07 17:26:02 +02:00
unknown
f3ea109f9b After merge fix. 2006-08-07 19:35:02 +05:00
unknown
4d22c359d0 Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  may.pils.ru:/home/svoj/devel/mysql/BUG14770/mysql-5.0-engines
 2006-08-07 18:00:46 +05:00
unknown
703c50e639 Add printouts in test case for bug17667 
tests/mysql_client_test.c:
  Add printout describing what master.log is to be opened.
  Add printout about statements that are found in the log.
 2006-08-07 14:02:57 +02:00
unknown
f93b1e4837 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-07 11:32:20 +02:00
unknown
966d11ef8d Change the 'sleep' into an explicit FLUSH LOGS command 2006-08-07 11:29:41 +02:00
unknown
a234e13a05 fflush(NULL) before abort so that all pending writes are performed 2006-08-07 10:16:37 +02:00
unknown
ef6019010d Merge mysql.com:/usr/home/bar/mysql-4.1.b19741v0 
into  mysql.com:/usr/home/bar/mysql-4.1.b19741
 2006-08-07 13:15:23 +05:00
unknown
a517c2440e Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.clean
 2006-08-07 11:57:53 +05:00
unknown
86a239f555 information_schema_db.test fixed 
mysql-test/t/information_schema_db.test:
  user dropped
 2006-08-07 11:56:22 +05:00
unknown
55bd10965a sql_view.cc: 
Memory leak fix


sql/sql_view.cc:
  Memory leak fix
 2006-08-07 07:41:49 +04:00
unknown
3212394a54 grant.result: 
manual merge


mysql-test/r/grant.result:
  manual merge
 2006-08-07 04:13:05 +02:00
unknown
20d0a277c2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/tnurnberg/work/mysql-5.0-maint-20214


mysql-test/r/grant.result:
  manual merge
mysql-test/t/grant.test:
  manual merge
 2006-08-07 01:39:05 +02:00
unknown
c57b6620c5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  sunlight.local:/local_work/leak_fix


sql/sql_view.cc:
  Auto merged
 2006-08-07 02:29:59 +04:00
unknown
89a9125b70 Flush stderr before calling abort() 2006-08-06 23:56:51 +02:00
unknown
ca23eef305 Merge sunlight.local:/home/evgen/bk-trees/mysql-5.0 
into  sunlight.local:/local_work/leak_fix


sql/sql_view.cc:
  Auto merged
 2006-08-07 00:06:54 +04:00
unknown
c34baab996 sql_view.cc: 
Memory leak fix


sql/sql_view.cc:
  Memory leak fix
 2006-08-07 00:06:03 +04:00
unknown
70d5bb95f9 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-06 20:59:43 +02:00
unknown
12de829a49 Send output from mysql_client_test to var/log/mysql_client_test.log 2006-08-06 20:58:30 +02:00
unknown
5efe5fd820 please don't call methods that should always execute inside assert() 
tests/mysql_client_test.c:
  fixed lines that are executing methods that should always execute inside assert()
 2006-08-05 18:58:38 -05:00
unknown
46ed9d0b67 mysql_client_test.c: 
Moving call that processes select results out of the assert


tests/mysql_client_test.c:
  Moving call that processes select results out of the assert
 2006-08-05 23:15:23 +02:00
unknown
e061ed925f relying on loop counter variables being local to the loop body if 
declared in the 'for' statement is not portable, some compilers
  still don't implement this ANSI C++ specification (Bug #14995)
 2006-08-05 13:41:22 +02:00
unknown
60a4f50c96 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0-kt 
into  production.mysql.com:/usersnfs/rburnett/mysql-5.0-kt


sql/mysqld.cc:
  Auto merged
 2006-08-04 21:34:46 +02:00
unknown
29e946ee5a lowercase_fs_off fails on windows because lower_case_file_system is not being 
set properly.  This patch should fix that.

mysqld.cc:
  Call test_if_case_insensitive in all cases so lower_case_file_system always gets set


sql/mysqld.cc:
  Call test_if_case_insensitive in all cases so lower_case_file_system always gets set
 2006-08-04 21:18:58 +02:00
unknown
d166ede9a3 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


client/mysql.cc:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
 2006-08-04 19:19:26 +02:00
unknown
cc10958f49 Add my_memmem.c to mysys.dsp (needed by mysql_client_test) 2006-08-04 01:41:21 +04:00
unknown
fc19d19d4a Fix a bug in the .dsp file. Ignore a symlink. 
BitKeeper/etc/ignore:
  Added ndb/src/common/util/testBitmask.cpp to the ignore list
VC++Files/sql/mysqld.dsp:
  Fix a bug in the .dsp file.
 2006-08-04 00:00:48 +04:00
unknown
faf2e23dc5 Bug #20968: incorrect DBUG_ENTER string in mysqld.cc network_init(void) function 
sql/mysqld.cc:
  Corrected debug message.
 2006-08-03 16:00:15 -04:00
unknown
0d9864b86c Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-03 19:18:24 +02:00
unknown
ef119c130b Merge rama.(none):/home/jimw/my/mysql-5.0-10668 
into  rama.(none):/home/jimw/my/mysql-5.0-clean
 2006-08-03 10:02:47 -07:00
unknown
6e72e3519d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-08-03 18:56:07 +02:00
unknown
f6d0bdcc2b Bug#20190 Unixware 7.13 port and make test errors 
- Thanks to cerber for the patch!


server-tools/instance-manager/portability.h:
  Define SHUT_RDWR also on Unixware 7
 2006-08-03 17:29:35 +02:00
unknown
6017f911e3 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt


client/mysql.cc:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.h:
  Auto merged
 2006-08-03 16:54:06 +02:00
unknown
65866b7bba Make test case for bug#21215repeateble by calling "reset master" 2006-08-03 16:47:24 +02:00
unknown
98157e78b1 Update result after merge, since the function Item::tmp_table_field_from_field_type() 
now takes mbmaxlen into account when calculating max_length of new field.
 2006-08-03 15:48:28 +02:00
unknown
9f97dd0b1f Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view 
"A SELECT privilege on a view is required for SHOW CREATE VIEW and it will stay
that way because of compatibility reasons." (see #20136)

a test case to illustrate how the ACLs work in this case (and ensure they will continue
to do so in the future)


mysql-test/r/grant.result:
  Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view
  
  a test case to illustrate how the ACLs work in this case (and ensure they will continue
  to do so in the future)
mysql-test/t/grant.test:
  Bug#20214: Incorrect error when user calls SHOW CREATE VIEW on non privileged view
  
  a test case to illustrate how the ACLs work in this case (and ensure they will continue
  to do so in the future)
 2006-08-03 14:58:13 +02:00
unknown
dba52b539a Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  may.pils.ru:/home/svoj/devel/mysql/BUG7391/mysql-4.1
 2006-08-03 15:49:41 +05:00
unknown
842ec23341 Bug#21419 test case lowercase_fs_off fails on Windows 
- Backport patch from 5.0


sql/mysqld.cc:
  Add else case to set "lower_case_file_system" also when lower_case_table_names are 1
 2006-08-03 12:16:24 +02:00
unknown
4b57917194 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
 2006-08-03 12:11:07 +02:00
unknown
234bb881c3 Remove double error printout in mysqldump 
client/mysqldump.c:
  Remove double error printout, mysql_query_with_error_report will do that. And set the exit code for us.
mysql-test/r/mysqldump.result:
  Update test result after merge
 2006-08-03 12:09:22 +02:00
unknown
9744e7f811 Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/t/mysqlbinlog.test:
  Null merge
 2006-08-03 11:59:57 +02:00
unknown
135ffa6360 Merge neptunus.(none):/home/msvensson/mysql/my41-bug21218 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1


mysql-test/t/mysqlbinlog.test:
  Auto merged
 2006-08-03 11:57:52 +02:00