database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

After merge fixes

Browse Source 
Fixed wrong test of database name (affected optimization of ORDER BY)
This commit is contained in:
monty@mashka.mysql.fi
2004-02-22 08:09:32 +02:00
parent 494e43c1f5
commit e1bc99c131
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
VC++Files/client/mysqlclient.dsp
View File

@ -358,6 +358,10 @@ SOURCE=..\mysys\my_open.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\mysys\my_file.c
# End Source File
# Begin Source File
SOURCE=..\mysys\my_pread.c SOURCE=..\mysys\my_pread.c
# End Source File # End Source File
# Begin Source File # Begin Source File

4
VC++Files/mysys/mysys.dsp
View File

@ -390,6 +390,10 @@ SOURCE=.\my_open.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\my_file.c
# End Source File
# Begin Source File
SOURCE=.\my_pread.c SOURCE=.\my_pread.c
# End Source File # End Source File
# Begin Source File # Begin Source File

4
mysql-test/r/negation_elimination.result
View File

@ -243,10 +243,6 @@ a
3 3
4 4
5 5
6
7
8
9
10 10
11 11
12 12

14
sql-common/client.c
View File

@ -286,7 +286,7 @@ HANDLE create_named_pipe(NET *net, uint connect_timeout, char **arg_host,
char **arg_unix_socket) char **arg_unix_socket)
{ {
HANDLE hPipe=INVALID_HANDLE_VALUE; HANDLE hPipe=INVALID_HANDLE_VALUE;
char szPipeName [ 257 ]; char pipe_name[1024];
DWORD dwMode; DWORD dwMode;
int i; int i;
my_bool testing_named_pipes=0; my_bool testing_named_pipes=0;
@ -297,13 +297,15 @@ HANDLE create_named_pipe(NET *net, uint connect_timeout, char **arg_host,
if (!host || !strcmp(host,LOCAL_HOST)) if (!host || !strcmp(host,LOCAL_HOST))
host=LOCAL_HOST_NAMEDPIPE; host=LOCAL_HOST_NAMEDPIPE;
sprintf( szPipeName, "\\\\%s\\pipe\\%s", host, unix_socket);
DBUG_PRINT("info",("Server name: '%s'. Named Pipe: %s", pipe_name[sizeof(pipe_name)-1]= 0; /* Safety if too long string */
host, unix_socket)); strxnmov(pipe_name, sizeof(pipe_name)-1, "\\\\", host, "\\pipe\\",
unix_socket, NullS);
DBUG_PRINT("info",("Server name: '%s'. Named Pipe: %s", host, unix_socket));
for (i=0 ; i < 100 ; i++) /* Don't retry forever */ for (i=0 ; i < 100 ; i++) /* Don't retry forever */
{ {
if ((hPipe = CreateFile(szPipeName, if ((hPipe = CreateFile(pipe_name,
GENERIC_READ | GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE,
0, 0,
NULL, NULL,
@ -320,7 +322,7 @@ HANDLE create_named_pipe(NET *net, uint connect_timeout, char **arg_host,
return INVALID_HANDLE_VALUE; return INVALID_HANDLE_VALUE;
} }
/* wait for for an other instance */ /* wait for for an other instance */
if (! WaitNamedPipe(szPipeName, connect_timeout*1000) ) if (! WaitNamedPipe(pipe_name, connect_timeout*1000) )
{ {
net->last_errno=CR_NAMEDPIPEWAIT_ERROR; net->last_errno=CR_NAMEDPIPEWAIT_ERROR;
strmov(net->sqlstate, unknown_sqlstate); strmov(net->sqlstate, unknown_sqlstate);

2
sql/sql_base.cc
View File

@ -2038,7 +2038,7 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter,
{ {
if (!strcmp(item_field->table_name,table_name) && if (!strcmp(item_field->table_name,table_name) &&
(!db_name || (db_name && item_field->db_name && (!db_name || (db_name && item_field->db_name &&
!strcmp(item_field->table_name,table_name)))) !strcmp(item_field->db_name, db_name))))
{ {
found= li.ref(); found= li.ref();
*counter= i; *counter= i;